From 4d4c79b0e391698148401f4a20f1131634adbb87 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 11 Oct 2022 14:04:46 +0200 Subject: [PATCH 1/5] fix: change verifyToken to verify --- .../cloud_firestore/lib/src/collection_reference.dart | 2 +- .../cloud_firestore/lib/src/document_change.dart | 2 +- .../cloud_firestore/lib/src/document_reference.dart | 2 +- .../cloud_firestore/lib/src/document_snapshot.dart | 2 +- .../cloud_firestore/lib/src/firestore.dart | 4 +++- .../cloud_firestore/lib/src/load_bundle_task.dart | 2 +- .../lib/src/load_bundle_task_snapshot.dart | 2 +- .../cloud_firestore/lib/src/query.dart | 2 +- .../cloud_firestore/lib/src/query_snapshot.dart | 2 +- .../cloud_firestore/lib/src/transaction.dart | 2 +- .../cloud_firestore/lib/src/write_batch.dart | 2 +- .../platform_interface_document_change.dart | 7 +++---- .../platform_interface_document_reference.dart | 4 ++-- .../platform_interface_document_snapshot.dart | 4 ++-- .../platform_interface_field_value_factory.dart | 11 +++++------ .../platform_interface_firestore.dart | 2 +- .../platform_interface_load_bundle_task.dart | 4 ++-- .../platform_interface_load_bundle_task_snapshot.dart | 5 +++-- .../platform_interface/platform_interface_query.dart | 6 +++--- .../platform_interface_query_snapshot.dart | 7 +++---- .../platform_interface_transaction.dart | 4 ++-- .../platform_interface_write_batch.dart | 4 ++-- .../platform_interface_query_test.dart | 4 ++-- .../platform_interface_transaction_test.dart | 4 ++-- .../platform_interface_write_batch_test.dart | 4 ++-- .../cloud_functions/lib/src/firebase_functions.dart | 4 +++- .../platform_interface_firebase_functions.dart | 2 +- .../platform_interface_https_callable.dart | 5 +++-- .../lib/src/firebase_analytics.dart | 4 +++- .../platform_interface_firebase_analytics.dart | 3 ++- .../lib/src/firebase_app_check.dart | 4 +++- .../platform_interface_firebase_app_check.dart | 2 +- .../lib/src/firebase_app_installations.dart | 4 +++- ...firebase_app_installations_platform_interface.dart | 2 +- .../firebase_auth/lib/src/confirmation_result.dart | 2 +- .../firebase_auth/lib/src/firebase_auth.dart | 4 +++- .../firebase_auth/lib/src/multi_factor.dart | 4 ++-- .../firebase_auth/firebase_auth/lib/src/user.dart | 2 +- .../firebase_auth/lib/src/user_credential.dart | 2 +- .../platform_interface_confirmation_result.dart | 4 ++-- .../platform_interface_firebase_auth.dart | 2 +- .../platform_interface_multi_factor.dart | 10 +++++----- ...platform_interface_recaptcha_verifier_factory.dart | 6 +++--- .../platform_interface/platform_interface_user.dart | 4 ++-- .../platform_interface_user_credential.dart | 4 ++-- .../platform_interface_confirmation_result_test.dart | 4 ++-- ...orm_interface_recaptcha_verifier_factory_test.dart | 4 ++-- .../platform_interface_user_credential_test.dart | 4 ++-- .../platform_interface_user_test.dart | 4 ++-- .../firebase_core/lib/src/firebase_app.dart | 2 +- .../platform_interface_firebase.dart | 2 +- .../platform_interface_firebase_app.dart | 4 ++-- .../platform_interface_firebase_plugin.dart | 4 ++-- .../lib/src/firebase_crashlytics.dart | 4 +++- .../platform_interface_crashlytics.dart | 2 +- .../firebase_database/lib/src/data_snapshot.dart | 2 +- .../firebase_database/lib/src/database_event.dart | 2 +- .../firebase_database/lib/src/firebase_database.dart | 1 + .../firebase_database/lib/src/on_disconnect.dart | 2 +- .../firebase_database/lib/src/transaction_result.dart | 2 +- .../platform_interface_data_snapshot.dart | 4 ++-- .../platform_interface_database.dart | 2 +- .../platform_interface_database_event.dart | 4 ++-- .../platform_interface_on_disconnect.dart | 4 ++-- .../platform_interface_transaction_result.dart | 4 ++-- .../lib/src/firebase_dynamic_links.dart | 4 +++- .../platform_interface_firebase_dynamic_links.dart | 4 ++-- .../lib/firebase_in_app_messaging.dart | 4 +++- .../platform_interface_firebase_in_app_messaging.dart | 2 +- .../firebase_messaging/lib/src/messaging.dart | 4 +++- .../platform_interface_messaging.dart | 2 +- .../lib/src/firebase_ml_model_downloader.dart | 4 +++- ...atform_interface_firebase_ml_model_downloader.dart | 4 ++-- .../lib/src/firebase_performance.dart | 4 +++- .../platform_interface_firebase_performance.dart | 2 +- .../platform_interface_http_metric.dart | 4 ++-- .../platform_interface/platform_interface_trace.dart | 4 ++-- .../lib/src/firebase_remote_config.dart | 4 +++- .../platform_interface_firebase_remote_config.dart | 2 +- .../firebase_storage/lib/src/firebase_storage.dart | 4 +++- .../firebase_storage/lib/src/list_result.dart | 2 +- .../firebase_storage/lib/src/reference.dart | 2 +- .../firebase_storage/lib/src/task.dart | 2 +- .../firebase_storage/lib/src/task_snapshot.dart | 2 +- .../platform_interface_firebase_storage.dart | 2 +- .../platform_interface_list_result.dart | 5 +++-- .../platform_interface_reference.dart | 5 +++-- .../platform_interface/platform_interface_task.dart | 5 +++-- .../platform_interface_task_snapshot.dart | 5 +++-- .../platform_interface_list_result_test.dart | 4 ++-- .../platform_interface_reference_test.dart | 4 ++-- .../platform_interface_task_test.dart | 4 ++-- 92 files changed, 178 insertions(+), 145 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart b/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart index adf6f9609807..b67faa148417 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart @@ -77,7 +77,7 @@ class _JsonCollectionReference extends _JsonQuery _JsonCollectionReference( FirebaseFirestore firestore, CollectionReferencePlatform _delegate, - ) : super(firestore, _delegate); + ) : super(firestore, _delegate) @override CollectionReferencePlatform get _delegate => diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/document_change.dart b/packages/cloud_firestore/cloud_firestore/lib/src/document_change.dart index ab28f795249c..e0ed95f7d1d9 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/document_change.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/document_change.dart @@ -32,7 +32,7 @@ abstract class DocumentChange { class _JsonDocumentChange implements DocumentChange> { _JsonDocumentChange(this._firestore, this._delegate) { - DocumentChangePlatform.verifyExtends(_delegate); + DocumentChangePlatform.verify(_delegate); } final DocumentChangePlatform _delegate; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/cloud_firestore/lib/src/document_reference.dart index 79f88baeab36..3cb70ae710fc 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/document_reference.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/document_reference.dart @@ -94,7 +94,7 @@ abstract class DocumentReference { class _JsonDocumentReference implements DocumentReference> { _JsonDocumentReference(this.firestore, this._delegate) { - DocumentReferencePlatform.verifyExtends(_delegate); + DocumentReferencePlatform.verify(_delegate); } @override diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/document_snapshot.dart b/packages/cloud_firestore/cloud_firestore/lib/src/document_snapshot.dart index cb161bec3542..16ee46488130 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/document_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/document_snapshot.dart @@ -59,7 +59,7 @@ abstract class DocumentSnapshot { class _JsonDocumentSnapshot implements DocumentSnapshot> { _JsonDocumentSnapshot(this._firestore, this._delegate) { - DocumentSnapshotPlatform.verifyExtends(_delegate); + DocumentSnapshotPlatform.verify(_delegate); } final FirebaseFirestore _firestore; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart index b05988df82fd..ba79a0aef98e 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart @@ -17,7 +17,9 @@ part of cloud_firestore; /// ``` class FirebaseFirestore extends FirebasePluginPlatform { FirebaseFirestore._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_firestore'); + : super(app.name, 'plugins.flutter.io/firebase_firestore') { + FirebasePluginPlatform.verify(instance); + } static final Map _cachedInstances = {}; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task.dart b/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task.dart index 1f8cdb6611e4..2d74a82f84ef 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task.dart @@ -6,7 +6,7 @@ part of cloud_firestore; class LoadBundleTask { LoadBundleTask._(this._delegate) { - LoadBundleTaskPlatform.verifyExtends(_delegate); + LoadBundleTaskPlatform.verify(_delegate); } final LoadBundleTaskPlatform _delegate; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task_snapshot.dart b/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task_snapshot.dart index a931629b3d05..869d3fe8dbef 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/load_bundle_task_snapshot.dart @@ -7,7 +7,7 @@ part of cloud_firestore; /// A [LoadBundleTaskSnapshot] is returned as the result or on-going process of a [LoadBundleTask]. class LoadBundleTaskSnapshot { LoadBundleTaskSnapshot._(this._delegate) { - LoadBundleTaskSnapshotPlatform.verifyExtends(_delegate); + LoadBundleTaskSnapshotPlatform.verify(_delegate); } LoadBundleTaskSnapshotPlatform _delegate; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/query.dart b/packages/cloud_firestore/cloud_firestore/lib/src/query.dart index ab55ddb055e3..639ca847c382 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/query.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/query.dart @@ -198,7 +198,7 @@ class _JsonQuery implements Query> { this.firestore, this._delegate, ) { - QueryPlatform.verifyExtends(_delegate); + QueryPlatform.verify(_delegate); } @override diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/cloud_firestore/lib/src/query_snapshot.dart index f053c258dfa4..d58096bc7490 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/query_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/query_snapshot.dart @@ -25,7 +25,7 @@ abstract class QuerySnapshot { /// It can contain zero or more [DocumentSnapshot] objects. class _JsonQuerySnapshot implements QuerySnapshot> { _JsonQuerySnapshot(this._firestore, this._delegate) { - QuerySnapshotPlatform.verifyExtends(_delegate); + QuerySnapshotPlatform.verify(_delegate); } final FirebaseFirestore _firestore; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/cloud_firestore/lib/src/transaction.dart index 5e4d36aa8f0e..9de2fc9df6ad 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/transaction.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/transaction.dart @@ -14,7 +14,7 @@ class Transaction { final TransactionPlatform _delegate; Transaction._(this._firestore, this._delegate) { - TransactionPlatform.verifyExtends(_delegate); + TransactionPlatform.verify(_delegate); } /// Reads the document referenced by the provided [DocumentReference]. diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/write_batch.dart b/packages/cloud_firestore/cloud_firestore/lib/src/write_batch.dart index ea6bad63de35..7ba43d6d40b4 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/write_batch.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/write_batch.dart @@ -12,7 +12,7 @@ part of cloud_firestore; /// nor can it be committed again. class WriteBatch { WriteBatch._(this._firestore, this._delegate) { - WriteBatchPlatform.verifyExtends(_delegate); + WriteBatchPlatform.verify(_delegate); } final FirebaseFirestore _firestore; diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_change.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_change.dart index be29407f3fca..9914d274f561 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_change.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_change.dart @@ -3,9 +3,8 @@ // 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:plugin_platform_interface/plugin_platform_interface.dart'; - import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; /// An enumeration of document change types. enum DocumentChangeType { @@ -42,8 +41,8 @@ class DocumentChangePlatform extends PlatformInterface { /// This is used by the app-facing [DocumentChange] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(DocumentChangePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(DocumentChangePlatform instance) { + PlatformInterface.verify(instance, _token); } /// The type of change that occurred (added, modified, or removed). diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_reference.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_reference.dart index 1595aaf6fbbd..e1de0d613b4d 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_reference.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_reference.dart @@ -31,8 +31,8 @@ abstract class DocumentReferencePlatform extends PlatformInterface { /// This is used by the app-facing [DocumentReference] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(DocumentReferencePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(DocumentReferencePlatform instance) { + PlatformInterface.verify(instance, _token); } /// The Firestore instance associated with this document reference diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_snapshot.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_snapshot.dart index 0863fcb89e05..12bb989ebd96 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_document_snapshot.dart @@ -26,8 +26,8 @@ class DocumentSnapshotPlatform extends PlatformInterface { /// This is used by the app-facing [DocumentSnapshot] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(DocumentSnapshotPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(DocumentSnapshotPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The [FirebaseFirestorePlatform] used to produce this [DocumentSnapshotPlatform]. diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_field_value_factory.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_field_value_factory.dart index abef81b8bf06..eb519592d749 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_field_value_factory.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_field_value_factory.dart @@ -3,10 +3,9 @@ // 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:plugin_platform_interface/plugin_platform_interface.dart'; - -import 'package:cloud_firestore_platform_interface/src/method_channel/method_channel_field_value_factory.dart'; import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; +import 'package:cloud_firestore_platform_interface/src/method_channel/method_channel_field_value_factory.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; /// An interface for a factory that is used to build a [FieldValuePlatform] according to /// Platform (web or mobile) @@ -24,7 +23,7 @@ abstract class FieldValueFactoryPlatform extends PlatformInterface { /// Sets the default instance of [FieldValueFactoryPlatform] which is used to build /// [FieldValuePlatform] items static set instance(FieldValueFactoryPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } @@ -36,8 +35,8 @@ abstract class FieldValueFactoryPlatform extends PlatformInterface { /// This is used by the app-facing [FieldValueFactory] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(FieldValueFactoryPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(FieldValueFactoryPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Returns a special value that tells the server to union the given elements diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_firestore.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_firestore.dart index 5dc4dbbda4e8..b154806999b5 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_firestore.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_firestore.dart @@ -57,7 +57,7 @@ abstract class FirebaseFirestorePlatform extends PlatformInterface { /// Sets the [FirebaseFirestorePlatform.instance] static set instance(FirebaseFirestorePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task.dart index aa6a54fb9ff8..194f778dfe63 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task.dart @@ -18,8 +18,8 @@ abstract class LoadBundleTaskPlatform extends PlatformInterface { /// This is used by the app-facing [LoadBundleTask] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(LoadBundleTaskPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(LoadBundleTaskPlatform instance) { + PlatformInterface.verify(instance, _token); } Stream get stream; 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 index f23c630167fa..a736b9c7741a 100644 --- 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 @@ -4,6 +4,7 @@ // found in the LICENSE file. import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../cloud_firestore_platform_interface.dart'; /// The interface a load bundle task snapshot must extend. @@ -24,8 +25,8 @@ class LoadBundleTaskSnapshotPlatform extends PlatformInterface { /// This is used by the app-facing [LoadBundleTaskSnapshot] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(LoadBundleTaskSnapshotPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(LoadBundleTaskSnapshotPlatform instance) { + PlatformInterface.verify(instance, _token); } final LoadBundleTaskState taskState; diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart index c89ba9c67023..ab341d0b100e 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart @@ -5,9 +5,9 @@ import 'dart:async'; +import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; import 'package:meta/meta.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; -import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; Map _initialParameters = Map.unmodifiable({ 'where': List>.unmodifiable([]), @@ -36,9 +36,9 @@ abstract class QueryPlatform extends PlatformInterface { /// This is used by the app-facing [Query] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(QueryPlatform instance) { + static void verify(QueryPlatform instance) { if (instance is! CollectionReferencePlatform) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); } } diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query_snapshot.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query_snapshot.dart index 50a1ce3686df..e735fea6959c 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query_snapshot.dart @@ -3,9 +3,8 @@ // 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:plugin_platform_interface/plugin_platform_interface.dart'; - import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; /// A interface that contains zero or more [DocumentSnapshotPlatform] objects /// representing the results of a query. @@ -28,8 +27,8 @@ class QuerySnapshotPlatform extends PlatformInterface { /// This is used by the app-facing [QuerySnapshot] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(QuerySnapshotPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(QuerySnapshotPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Gets a list of all the documents included in this [QuerySnapshotPlatform] diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_transaction.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_transaction.dart index 5467a453451b..9537c471402a 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_transaction.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_transaction.dart @@ -26,8 +26,8 @@ abstract class TransactionPlatform extends PlatformInterface { /// This is used by the app-facing [Transaction] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(TransactionPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(TransactionPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Returns all transaction commands for the current instance. diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_write_batch.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_write_batch.dart index aa6486b031dd..1dd72b59ed03 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_write_batch.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_write_batch.dart @@ -27,8 +27,8 @@ abstract class WriteBatchPlatform extends PlatformInterface { /// This is used by the app-facing [WriteBatch] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(WriteBatchPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(WriteBatchPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Commits all of the writes in this write batch as a single atomic unit. diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_query_test.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_query_test.dart index 76ad99a8b0d5..6be97480e836 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_query_test.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_query_test.dart @@ -44,9 +44,9 @@ void main() { expect(query, isInstanceOf()); }); - test('verifyExtends()', () { + test('verify()', () { final query = TestQuery._(); - QueryPlatform.verifyExtends(query); + QueryPlatform.verify(query); expect(query, isInstanceOf()); }); diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_transaction_test.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_transaction_test.dart index 133df579d90a..1bff50442526 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_transaction_test.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_transaction_test.dart @@ -34,9 +34,9 @@ void main() { expect(transaction, isInstanceOf()); }); - test('verifyExtends()', () { + test('verify()', () { final transaction = TestTransaction._(); - TransactionPlatform.verifyExtends(transaction); + TransactionPlatform.verify(transaction); expect(transaction, isInstanceOf()); }); diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_write_batch_test.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_write_batch_test.dart index 84e19da29fbb..d3cd6a56c1aa 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_write_batch_test.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/test/platform_interface_tests/platform_interface_write_batch_test.dart @@ -34,9 +34,9 @@ void main() { expect(batch, isInstanceOf()); }); - test('verifyExtends()', () { + test('verify()', () { final batch = TestWriteBatch._(); - WriteBatchPlatform.verifyExtends(batch); + WriteBatchPlatform.verify(batch); expect(batch, isInstanceOf()); }); diff --git a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart index 732b5f07296d..2c1a0275e626 100644 --- a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart +++ b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart @@ -11,7 +11,9 @@ part of cloud_functions; class FirebaseFunctions extends FirebasePluginPlatform { FirebaseFunctions._({required this.app, String? region}) : _region = region ??= 'us-central1', - super(app.name, 'plugins.flutter.io/firebase_functions'); + super(app.name, 'plugins.flutter.io/firebase_functions') { + FirebasePluginPlatform.verify(instance); + } // Cached and lazily loaded instance of [FirebaseFunctionsPlatform] to avoid // creating a [MethodChannelFirebaseFunctions] when not needed or creating an diff --git a/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_firebase_functions.dart b/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_firebase_functions.dart index 978ced30083a..ac20bcffd1ec 100644 --- a/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_firebase_functions.dart +++ b/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_firebase_functions.dart @@ -49,7 +49,7 @@ abstract class FirebaseFunctionsPlatform extends PlatformInterface { /// Sets the [FirebaseFunctionsPlatform.instance] static set instance(FirebaseFunctionsPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_https_callable.dart b/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_https_callable.dart index bd6687e4e51a..62f033e1492e 100644 --- a/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_https_callable.dart +++ b/packages/cloud_functions/cloud_functions_platform_interface/lib/src/platform_interface/platform_interface_https_callable.dart @@ -6,6 +6,7 @@ import 'dart:async'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../cloud_functions_platform_interface.dart'; /// Interface for [HttpsCallable] implementations. @@ -24,8 +25,8 @@ abstract class HttpsCallablePlatform extends PlatformInterface { /// This is used by the app-facing [HttpsCallable] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(HttpsCallablePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(HttpsCallablePlatform instance) { + PlatformInterface.verify(instance, _token); } /// The [FirebaseFunctionsPlatform] instance. diff --git a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart index 621e8cbae759..5fb6bde5442a 100755 --- a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart +++ b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart @@ -7,7 +7,9 @@ part of firebase_analytics; /// Firebase Analytics API. class FirebaseAnalytics extends FirebasePluginPlatform { FirebaseAnalytics._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_analytics'); + : super(app.name, 'plugins.flutter.io/firebase_analytics') { + FirebasePluginPlatform.verify(instance); + } /// Namespace for analytics API available on Android only. This is deprecated in favor of /// `FirebaseAnalytics.instance.setSessionTimeoutDuration()`. diff --git a/packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart index bb1a5a9c78ae..056188fa4aae 100644 --- a/packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart +++ b/packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'dart:async'; + import 'package:firebase_core/firebase_core.dart'; import 'package:meta/meta.dart' show protected; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; @@ -53,7 +54,7 @@ abstract class FirebaseAnalyticsPlatform extends PlatformInterface { /// Sets the [FirebaseAnalyticsPlatform.instance] static set instance(FirebaseAnalyticsPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart index 12abdca99bed..7c632be9698d 100644 --- a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart +++ b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart @@ -9,7 +9,9 @@ class FirebaseAppCheck extends FirebasePluginPlatform { static Map _firebaseAppCheckInstances = {}; FirebaseAppCheck._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_check'); + : super(app.name, 'plugins.flutter.io/firebase_app_check') { + FirebasePluginPlatform.verify(instance); + } /// Cached instance of [FirebaseAppCheck]; static FirebaseAppCheck? _instance; diff --git a/packages/firebase_app_check/firebase_app_check_platform_interface/lib/src/platform_interface/platform_interface_firebase_app_check.dart b/packages/firebase_app_check/firebase_app_check_platform_interface/lib/src/platform_interface/platform_interface_firebase_app_check.dart index d7847556ce81..f403d265733e 100644 --- a/packages/firebase_app_check/firebase_app_check_platform_interface/lib/src/platform_interface/platform_interface_firebase_app_check.dart +++ b/packages/firebase_app_check/firebase_app_check_platform_interface/lib/src/platform_interface/platform_interface_firebase_app_check.dart @@ -49,7 +49,7 @@ abstract class FirebaseAppCheckPlatform extends PlatformInterface { /// Sets the [FirebaseAppCheckPlatform.instance] static set instance(FirebaseAppCheckPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart index 443946d7c06f..f62ca4179024 100644 --- a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart +++ b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart @@ -6,7 +6,9 @@ part of firebase_app_installations; class FirebaseInstallations extends FirebasePluginPlatform { FirebaseInstallations._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_installations'); + : super(app.name, 'plugins.flutter.io/firebase_app_installations') { + FirebasePluginPlatform.verify(instance); + } // Cached and lazily loaded instance of [FirebaseAppInstallationsPlatform] to avoid // creating a [MethodChannelFirebaseInstallations] when not needed or creating an diff --git a/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/src/platform_interface/firebase_app_installations_platform_interface.dart b/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/src/platform_interface/firebase_app_installations_platform_interface.dart index dbd28afa5fa6..5cef18038727 100644 --- a/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/src/platform_interface/firebase_app_installations_platform_interface.dart +++ b/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/src/platform_interface/firebase_app_installations_platform_interface.dart @@ -35,7 +35,7 @@ abstract class FirebaseAppInstallationsPlatform extends PlatformInterface { /// Sets the [FirebaseAppInstallationsPlatform.instance] static set instance(FirebaseAppInstallationsPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_auth/firebase_auth/lib/src/confirmation_result.dart b/packages/firebase_auth/firebase_auth/lib/src/confirmation_result.dart index c545da5b35f9..29050019dd53 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/confirmation_result.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/confirmation_result.dart @@ -14,7 +14,7 @@ class ConfirmationResult { final FirebaseAuth _auth; ConfirmationResult._(this._auth, this._delegate) { - ConfirmationResultPlatform.verifyExtends(_delegate); + ConfirmationResultPlatform.verify(_delegate); } /// The phone number authentication operation's verification ID. diff --git a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart index 22f0f226e4b0..44ded36b36d2 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart @@ -37,7 +37,9 @@ class FirebaseAuth extends FirebasePluginPlatform { FirebaseAuth._({required this.app, Persistence? persistence}) : _persistence = persistence, - super(app.name, 'plugins.flutter.io/firebase_auth'); + super(app.name, 'plugins.flutter.io/firebase_auth') { + FirebasePluginPlatform.verify(instance); + } /// Returns an instance using the default [FirebaseApp]. static FirebaseAuth get instance { diff --git a/packages/firebase_auth/firebase_auth/lib/src/multi_factor.dart b/packages/firebase_auth/firebase_auth/lib/src/multi_factor.dart index dc9549fc6987..d76d2205cabd 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/multi_factor.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/multi_factor.dart @@ -64,7 +64,7 @@ class MultiFactorAssertion { final MultiFactorAssertionPlatform _delegate; MultiFactorAssertion._(this._delegate) { - MultiFactorAssertionPlatform.verifyExtends(_delegate); + MultiFactorAssertionPlatform.verify(_delegate); } } @@ -75,7 +75,7 @@ class MultiFactorResolver { final MultiFactorResolverPlatform _delegate; MultiFactorResolver._(this._auth, this._delegate) { - MultiFactorResolverPlatform.verifyExtends(_delegate); + MultiFactorResolverPlatform.verify(_delegate); } /// List of [MultiFactorInfo] which represents the available diff --git a/packages/firebase_auth/firebase_auth/lib/src/user.dart b/packages/firebase_auth/firebase_auth/lib/src/user.dart index 0cf504fa513b..66280bf49fdc 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/user.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/user.dart @@ -13,7 +13,7 @@ class User { MultiFactor? _multiFactor; User._(this._auth, this._delegate) { - UserPlatform.verifyExtends(_delegate); + UserPlatform.verify(_delegate); } /// The users display name. diff --git a/packages/firebase_auth/firebase_auth/lib/src/user_credential.dart b/packages/firebase_auth/firebase_auth/lib/src/user_credential.dart index d384078f8590..8dde90165344 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/user_credential.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/user_credential.dart @@ -9,7 +9,7 @@ part of firebase_auth; /// [createUserWithEmailAndPassword]. class UserCredential { UserCredential._(this._auth, this._delegate) { - UserCredentialPlatform.verifyExtends(_delegate); + UserCredentialPlatform.verify(_delegate); } final FirebaseAuth _auth; diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_confirmation_result.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_confirmation_result.dart index ab8e28e9e0bf..ca92f7c3286e 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_confirmation_result.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_confirmation_result.dart @@ -18,8 +18,8 @@ abstract class ConfirmationResultPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate instances extend this class. - static void verifyExtends(ConfirmationResultPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(ConfirmationResultPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The phone number authentication operation's verification ID. diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_firebase_auth.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_firebase_auth.dart index 47eb10be4e69..2d47eeb6fb37 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_firebase_auth.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_firebase_auth.dart @@ -75,7 +75,7 @@ abstract class FirebaseAuthPlatform extends PlatformInterface { /// Sets the [FirebaseAuthPlatform.instance] static set instance(FirebaseAuthPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_multi_factor.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_multi_factor.dart index 97ea0408712f..e23a6075b162 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_multi_factor.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_multi_factor.dart @@ -71,8 +71,8 @@ class MultiFactorAssertionPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate class has extended a [MultiFactorResolverPlatform]. - static void verifyExtends(MultiFactorAssertionPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(MultiFactorAssertionPlatform instance) { + PlatformInterface.verify(instance, _token); } } @@ -90,8 +90,8 @@ class MultiFactorResolverPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate class has extended a [MultiFactorResolverPlatform]. - static void verifyExtends(MultiFactorResolverPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(MultiFactorResolverPlatform instance) { + PlatformInterface.verify(instance, _token); } /// List of [MultiFactorInfo] which represents the available @@ -177,7 +177,7 @@ class PhoneMultiFactorGeneratorPlatform extends PlatformInterface { /// Sets the [PhoneMultiFactorGeneratorPlatform.instance] static set instance(PhoneMultiFactorGeneratorPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart index 90cc8a963fce..65fb3241aae6 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart @@ -61,13 +61,13 @@ abstract class RecaptchaVerifierFactoryPlatform extends PlatformInterface { /// Sets a factory delegate as the current [RecaptchaVerifierFactoryPlatform] /// instance. static set instance(RecaptchaVerifierFactoryPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } /// Ensures that a delegate class extends [RecaptchaVerifierFactoryPlatform]. - static void verifyExtends(RecaptchaVerifierFactoryPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(RecaptchaVerifierFactoryPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Returns the assigned factory delegate. diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user.dart index 88bda67eb3d5..e23384156b71 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user.dart @@ -18,8 +18,8 @@ abstract class UserPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate class has extended a [UserPlatform]. - static void verifyExtends(UserPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(UserPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The [FirebaseAuthPlatform] instance. diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user_credential.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user_credential.dart index dcf92b9f873c..5a4dc49e645f 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user_credential.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_user_credential.dart @@ -21,8 +21,8 @@ abstract class UserCredentialPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate class has extended a [UserCredentialPlatform]. - static void verifyExtends(UserCredentialPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(UserCredentialPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The current FirebaseAuth instance. 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 index b76e0c3f14cc..7de1d4930157 100644 --- 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 @@ -23,10 +23,10 @@ void main() { expect(confirmationResultPlatform, isA()); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - ConfirmationResultPlatform.verifyExtends(confirmationResultPlatform); + ConfirmationResultPlatform.verify(confirmationResultPlatform); return; } catch (_) { fail('thrown an unexpected exception'); diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart index 9dec1897780f..a33a1b365049 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart @@ -43,10 +43,10 @@ void main() { } }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - RecaptchaVerifierFactoryPlatform.verifyExtends( + RecaptchaVerifierFactoryPlatform.verify( recaptchaVerifierFactoryPlatform); return; } catch (_) { diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_credential_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_credential_test.dart index 59ff94d8b2e5..1afded4870d1 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_credential_test.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_credential_test.dart @@ -82,10 +82,10 @@ void main() { }); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - UserCredentialPlatform.verifyExtends(userCredentialPlatform); + UserCredentialPlatform.verify(userCredentialPlatform); return; } catch (_) { fail('thrown an unexpected exception'); diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_test.dart index a00db12c7b5a..43cd0da0fe65 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_test.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_user_test.dart @@ -69,10 +69,10 @@ void main() { }); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - UserPlatform.verifyExtends(userPlatform); + UserPlatform.verify(userPlatform); return; } catch (_) { fail('thrown an unexpected exception'); diff --git a/packages/firebase_core/firebase_core/lib/src/firebase_app.dart b/packages/firebase_core/firebase_core/lib/src/firebase_app.dart index 7c2850c56882..5c54c8dceebc 100644 --- a/packages/firebase_core/firebase_core/lib/src/firebase_app.dart +++ b/packages/firebase_core/firebase_core/lib/src/firebase_app.dart @@ -15,7 +15,7 @@ class FirebaseApp { /// This constructor ensures that the delegate instance it is /// constructed with is one which extends [FirebaseAppPlatform]. FirebaseApp._(this._delegate) { - FirebaseAppPlatform.verifyExtends(_delegate); + FirebaseAppPlatform.verify(_delegate); } final FirebaseAppPlatform _delegate; diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase.dart index 8b3b1519c6b2..754acdabbac8 100644 --- a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase.dart +++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase.dart @@ -30,7 +30,7 @@ abstract class FirebasePlatform extends PlatformInterface { static FirebasePlatform _instance = MethodChannelFirebase(); static set instance(FirebasePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_app.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_app.dart index 2b2acd795c50..e49ec4cbc78f 100644 --- a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_app.dart +++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_app.dart @@ -15,8 +15,8 @@ class FirebaseAppPlatform extends PlatformInterface { static final Object _token = Object(); // ignore: public_member_api_docs - static void verifyExtends(FirebaseAppPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(FirebaseAppPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The name of this Firebase app. diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_plugin.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_plugin.dart index 3c0191513bac..ad24bdbc7841 100644 --- a/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_plugin.dart +++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/platform_interface/platform_interface_firebase_plugin.dart @@ -29,8 +29,8 @@ abstract class FirebasePluginPlatform extends PlatformInterface { static final Object _token = Object(); // ignore: public_member_api_docs - static void verifyExtends(FirebasePluginPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(FirebasePluginPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Returns any plugin constants this plugin app instance has initialized. diff --git a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart index 4964ee52e367..310991db3c8e 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart @@ -10,7 +10,9 @@ part of firebase_crashlytics; /// You can get an instance by calling [FirebaseCrashlytics.instance]. class FirebaseCrashlytics extends FirebasePluginPlatform { FirebaseCrashlytics._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_crashlytics'); + : super(app.name, 'plugins.flutter.io/firebase_crashlytics') { + FirebasePluginPlatform.verify(instance); + } /// Cached instance of [FirebaseCrashlytics]; static FirebaseCrashlytics? _instance; diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/lib/src/platform_interface/platform_interface_crashlytics.dart b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/lib/src/platform_interface/platform_interface_crashlytics.dart index 36b8d3db48dc..32af6e7f3a83 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/lib/src/platform_interface/platform_interface_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/lib/src/platform_interface/platform_interface_crashlytics.dart @@ -60,7 +60,7 @@ abstract class FirebaseCrashlyticsPlatform extends PlatformInterface { /// Sets the [FirebaseCrashlyticsPlatform.instance] static set instance(FirebaseCrashlyticsPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_database/firebase_database/lib/src/data_snapshot.dart b/packages/firebase_database/firebase_database/lib/src/data_snapshot.dart index fb6a4edff9f9..5cf5451e55c8 100644 --- a/packages/firebase_database/firebase_database/lib/src/data_snapshot.dart +++ b/packages/firebase_database/firebase_database/lib/src/data_snapshot.dart @@ -10,7 +10,7 @@ class DataSnapshot { final DataSnapshotPlatform _delegate; DataSnapshot._(this._delegate) { - DataSnapshotPlatform.verifyExtends(_delegate); + DataSnapshotPlatform.verify(_delegate); } /// The key of the location that generated this DataSnapshot or null if at diff --git a/packages/firebase_database/firebase_database/lib/src/database_event.dart b/packages/firebase_database/firebase_database/lib/src/database_event.dart index ea1bf2ef5000..628aab476c09 100644 --- a/packages/firebase_database/firebase_database/lib/src/database_event.dart +++ b/packages/firebase_database/firebase_database/lib/src/database_event.dart @@ -10,7 +10,7 @@ class DatabaseEvent { final DatabaseEventPlatform _delegate; DatabaseEvent._(this._delegate) { - DatabaseEventPlatform.verifyExtends(_delegate); + DatabaseEventPlatform.verify(_delegate); } /// The type of event. diff --git a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart index 1a1373b6bd0e..cc8f8e2e589b 100644 --- a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart +++ b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart @@ -21,6 +21,7 @@ class FirebaseDatabase extends FirebasePluginPlatform { FirebaseDatabase._({required this.app, this.databaseURL}) : super(app.name, 'plugins.flutter.io/firebase_database') { + FirebasePluginPlatform.verify(instance); if (databaseURL != null && databaseURL!.endsWith('/')) { databaseURL = databaseURL!.substring(0, databaseURL!.length - 1); } diff --git a/packages/firebase_database/firebase_database/lib/src/on_disconnect.dart b/packages/firebase_database/firebase_database/lib/src/on_disconnect.dart index 0f5ac85279bf..484d41683d41 100644 --- a/packages/firebase_database/firebase_database/lib/src/on_disconnect.dart +++ b/packages/firebase_database/firebase_database/lib/src/on_disconnect.dart @@ -24,7 +24,7 @@ class OnDisconnect { OnDisconnectPlatform _delegate; OnDisconnect._(this._delegate) { - OnDisconnectPlatform.verifyExtends(_delegate); + OnDisconnectPlatform.verify(_delegate); } /// Ensures the data at this location is set to the specified value when the diff --git a/packages/firebase_database/firebase_database/lib/src/transaction_result.dart b/packages/firebase_database/firebase_database/lib/src/transaction_result.dart index c4bf2f98bf71..3a501227e8b6 100644 --- a/packages/firebase_database/firebase_database/lib/src/transaction_result.dart +++ b/packages/firebase_database/firebase_database/lib/src/transaction_result.dart @@ -9,7 +9,7 @@ class TransactionResult { TransactionResultPlatform _delegate; TransactionResult._(this._delegate) { - TransactionResultPlatform.verifyExtends(_delegate); + TransactionResultPlatform.verify(_delegate); } /// The [committed] status associated to this transaction result. diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_data_snapshot.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_data_snapshot.dart index 62427ed84ef9..1695735a50b5 100644 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_data_snapshot.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_data_snapshot.dart @@ -18,8 +18,8 @@ abstract class DataSnapshotPlatform extends PlatformInterface { /// This is used by the app-facing [DocumentSnapshot] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(DataSnapshotPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(DataSnapshotPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The Reference for the location that generated this DataSnapshot. diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database.dart index 2ebdf129fcd6..44aa54648703 100644 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database.dart @@ -48,7 +48,7 @@ abstract class DatabasePlatform extends PlatformInterface { } static set instance(DatabasePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database_event.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database_event.dart index 1ee4ee9aa4db..8570f2f4055f 100755 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database_event.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_database_event.dart @@ -64,8 +64,8 @@ abstract class DatabaseEventPlatform extends PlatformInterface { /// Throws an [AssertionError] if [instance] does not extend /// [DatabaseEventPlatform]. - static void verifyExtends(DatabaseEventPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(DatabaseEventPlatform instance) { + PlatformInterface.verify(instance, _token); } DataSnapshotPlatform get snapshot { diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_on_disconnect.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_on_disconnect.dart index aa6ea548889c..d5fc6367cee3 100755 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_on_disconnect.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_on_disconnect.dart @@ -14,8 +14,8 @@ abstract class OnDisconnectPlatform extends PlatformInterface { /// Throws an [AssertionError] if [instance] does not extend /// [OnDisconnectPlatform]. - static void verifyExtends(OnDisconnectPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(OnDisconnectPlatform instance) { + PlatformInterface.verify(instance, _token); } static final Object _token = Object(); diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_transaction_result.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_transaction_result.dart index 1a88b814ffd1..9a7dd9ab2ec7 100644 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_transaction_result.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_transaction_result.dart @@ -17,8 +17,8 @@ class TransactionResultPlatform extends PlatformInterface { /// Throws an [AssertionError] if [instance] does not extend /// [TransactionResultPlatform]. - static void verifyExtends(TransactionResultPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(TransactionResultPlatform instance) { + PlatformInterface.verify(instance, _token); } static final Object _token = Object(); diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart index 034fea588e0e..5f4c17fcc4cf 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart @@ -9,7 +9,9 @@ part of firebase_dynamic_links; /// You can get an instance by calling [FirebaseDynamicLinks.instance]. class FirebaseDynamicLinks extends FirebasePluginPlatform { FirebaseDynamicLinks._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_dynamic_links'); + : super(app.name, 'plugins.flutter.io/firebase_dynamic_links') { + FirebasePluginPlatform.verify(instance); + } static final Map _cachedInstances = {}; diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/lib/src/platform_interface/platform_interface_firebase_dynamic_links.dart b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/lib/src/platform_interface/platform_interface_firebase_dynamic_links.dart index 8d25d55034f8..2451360b0e4b 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/lib/src/platform_interface/platform_interface_firebase_dynamic_links.dart +++ b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/lib/src/platform_interface/platform_interface_firebase_dynamic_links.dart @@ -5,9 +5,9 @@ import 'dart:async'; import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_dynamic_links_platform_interface/firebase_dynamic_links_platform_interface.dart'; import 'package:meta/meta.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; -import 'package:firebase_dynamic_links_platform_interface/firebase_dynamic_links_platform_interface.dart'; import '../method_channel/method_channel_firebase_dynamic_links.dart'; @@ -44,7 +44,7 @@ abstract class FirebaseDynamicLinksPlatform extends PlatformInterface { /// Sets the [FirebaseFirestorePlatform.instance] static set instance(FirebaseDynamicLinksPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart index 857c0f25c376..4a2a68bca5da 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart @@ -9,7 +9,9 @@ import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_mes class FirebaseInAppMessaging extends FirebasePluginPlatform { FirebaseInAppMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging'); + : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging') { + FirebasePluginPlatform.verify(instance); + } /// The [FirebaseApp] for this current [FirebaseAnalytics] instance. final FirebaseApp app; diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/platform_interface/platform_interface_firebase_in_app_messaging.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/platform_interface/platform_interface_firebase_in_app_messaging.dart index 5d3945f709e2..5b0ab91c41e6 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/platform_interface/platform_interface_firebase_in_app_messaging.dart +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/platform_interface/platform_interface_firebase_in_app_messaging.dart @@ -36,7 +36,7 @@ abstract class FirebaseInAppMessagingPlatform extends PlatformInterface { /// Sets the [FirebaseInAppMessagingPlatform.instance] static set instance(FirebaseInAppMessagingPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart index c1bd9ce38f4b..9d1daf4539f1 100644 --- a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart +++ b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart @@ -25,7 +25,9 @@ class FirebaseMessaging extends FirebasePluginPlatform { FirebaseApp app; FirebaseMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_messaging'); + : super(app.name, 'plugins.flutter.io/firebase_messaging') { + FirebasePluginPlatform.verify(instance); + } /// Returns an instance using the default [FirebaseApp]. static FirebaseMessaging get instance { diff --git a/packages/firebase_messaging/firebase_messaging_platform_interface/lib/src/platform_interface/platform_interface_messaging.dart b/packages/firebase_messaging/firebase_messaging_platform_interface/lib/src/platform_interface/platform_interface_messaging.dart index 7ef3abd30c58..20956d39fedf 100644 --- a/packages/firebase_messaging/firebase_messaging_platform_interface/lib/src/platform_interface/platform_interface_messaging.dart +++ b/packages/firebase_messaging/firebase_messaging_platform_interface/lib/src/platform_interface/platform_interface_messaging.dart @@ -56,7 +56,7 @@ abstract class FirebaseMessagingPlatform extends PlatformInterface { /// Sets the [FirebaseMessagingPlatform.instance] static set instance(FirebaseMessagingPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart index f5661a9ca0d3..7a3ed559dd3b 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart @@ -6,7 +6,9 @@ part of firebase_ml_model_downloader; class FirebaseModelDownloader extends FirebasePluginPlatform { FirebaseModelDownloader._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader'); + : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader') { + FirebasePluginPlatform.verify(instance); + } // Cached and lazily loaded instance of [FirebaseModelDownloaderPlatform] to avoid // creating a [MethodChannelFirebaseFunctions] when not needed or creating an diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/lib/src/platform_interface/platform_interface_firebase_ml_model_downloader.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/lib/src/platform_interface/platform_interface_firebase_ml_model_downloader.dart index 8adc7cb86f15..55027547bac9 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/lib/src/platform_interface/platform_interface_firebase_ml_model_downloader.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/lib/src/platform_interface/platform_interface_firebase_ml_model_downloader.dart @@ -7,8 +7,8 @@ import 'package:meta/meta.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; import '../custom_model.dart'; -import '../download_type.dart'; import '../download_conditions.dart'; +import '../download_type.dart'; import '../method_channel/method_channel_firebase_ml_model_downloader.dart'; abstract class FirebaseModelDownloaderPlatform extends PlatformInterface { @@ -40,7 +40,7 @@ abstract class FirebaseModelDownloaderPlatform extends PlatformInterface { /// Sets the [FirebaseModelDownloaderPlatform.instance] static set instance(FirebaseModelDownloaderPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart index a26fd2454a7c..dada0c9fbc87 100644 --- a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart +++ b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart @@ -9,7 +9,9 @@ part of firebase_performance; /// You can get an instance by calling [FirebasePerformance.instance]. class FirebasePerformance extends FirebasePluginPlatform { FirebasePerformance._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_performance'); + : super(app.name, 'plugins.flutter.io/firebase_performance') { + FirebasePluginPlatform.verify(instance); + } // Cached and lazily loaded instance of [FirebasePerformancePlatform] to avoid // creating a [MethodChannelFirebasePerformance] when not needed or creating an diff --git a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_firebase_performance.dart b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_firebase_performance.dart index 1420c550f991..8fe858f9ed2c 100644 --- a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_firebase_performance.dart +++ b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_firebase_performance.dart @@ -41,7 +41,7 @@ abstract class FirebasePerformancePlatform extends PlatformInterface { /// Sets the [FirebasePerformancePlatform] instance. static set instance(FirebasePerformancePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_http_metric.dart b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_http_metric.dart index 8e10616649ac..d29f7d2bf319 100644 --- a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_http_metric.dart +++ b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_http_metric.dart @@ -10,8 +10,8 @@ abstract class HttpMetricPlatform extends PlatformInterface { static final Object _token = Object(); /// Ensures that any delegate class has extended a [HttpMetricPlatform]. - static void verifyExtends(HttpMetricPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(HttpMetricPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Maximum allowed length of a key passed to [putAttribute]. diff --git a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_trace.dart b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_trace.dart index 37d7ed722436..912f551c3115 100644 --- a/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_trace.dart +++ b/packages/firebase_performance/firebase_performance_platform_interface/lib/src/platform_interface/platform_interface_trace.dart @@ -9,8 +9,8 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart'; abstract class TracePlatform extends PlatformInterface { TracePlatform() : super(token: _token); - static void verifyExtends(TracePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(TracePlatform instance) { + PlatformInterface.verify(instance, _token); } static final Object _token = Object(); diff --git a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart index 7f41e29a817c..3667731bc350 100644 --- a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart @@ -11,7 +11,9 @@ part of firebase_remote_config; // ignore: prefer_mixin class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { FirebaseRemoteConfig._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_remote_config'); + : super(app.name, 'plugins.flutter.io/firebase_remote_config') { + FirebasePluginPlatform.verify(instance); + } // Cached instances of [FirebaseRemoteConfig]. static final Map diff --git a/packages/firebase_remote_config/firebase_remote_config_platform_interface/lib/src/platform_interface/platform_interface_firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config_platform_interface/lib/src/platform_interface/platform_interface_firebase_remote_config.dart index 031ac4043982..0d4aebfb7a7b 100644 --- a/packages/firebase_remote_config/firebase_remote_config_platform_interface/lib/src/platform_interface/platform_interface_firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config_platform_interface/lib/src/platform_interface/platform_interface_firebase_remote_config.dart @@ -52,7 +52,7 @@ abstract class FirebaseRemoteConfigPlatform extends PlatformInterface { /// Sets the [FirebaseRemoteConfigPlatform] instance. static set instance(FirebaseRemoteConfigPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart index d8521b3b335d..a8da0739c390 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart @@ -8,7 +8,9 @@ part of firebase_storage; /// The entrypoint for [FirebaseStorage]. class FirebaseStorage extends FirebasePluginPlatform { FirebaseStorage._({required this.app, required this.bucket}) - : super(app.name, 'plugins.flutter.io/firebase_storage'); + : super(app.name, 'plugins.flutter.io/firebase_storage') { + FirebasePluginPlatform.verify(instance); + } // Cached and lazily loaded instance of [FirebaseStoragePlatform] to avoid // creating a [MethodChannelStorage] when not needed or creating an diff --git a/packages/firebase_storage/firebase_storage/lib/src/list_result.dart b/packages/firebase_storage/firebase_storage/lib/src/list_result.dart index 9c0441f4b2d4..1a8bf86843eb 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/list_result.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/list_result.dart @@ -9,7 +9,7 @@ part of firebase_storage; /// on a [Reference]. class ListResult { ListResult._(this.storage, this._delegate) { - ListResultPlatform.verifyExtends(_delegate); + ListResultPlatform.verify(_delegate); } ListResultPlatform _delegate; diff --git a/packages/firebase_storage/firebase_storage/lib/src/reference.dart b/packages/firebase_storage/firebase_storage/lib/src/reference.dart index 3933545919bd..5b3dbe555385 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/reference.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/reference.dart @@ -9,7 +9,7 @@ part of firebase_storage; /// upload, download, and delete objects, as well as get/set object metadata. class Reference { Reference._(this.storage, this._delegate) { - ReferencePlatform.verifyExtends(_delegate); + ReferencePlatform.verify(_delegate); } ReferencePlatform _delegate; diff --git a/packages/firebase_storage/firebase_storage/lib/src/task.dart b/packages/firebase_storage/firebase_storage/lib/src/task.dart index e72a2111735c..961ad746cf88 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/task.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/task.dart @@ -8,7 +8,7 @@ part of firebase_storage; /// A class representing an on-going storage task that additionally delegates to a [Future]. abstract class Task implements Future { Task._(this.storage, this._delegate) { - TaskPlatform.verifyExtends(_delegate); + TaskPlatform.verify(_delegate); } TaskPlatform _delegate; diff --git a/packages/firebase_storage/firebase_storage/lib/src/task_snapshot.dart b/packages/firebase_storage/firebase_storage/lib/src/task_snapshot.dart index 4bcf97428eb6..ebb3bfff889e 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/task_snapshot.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/task_snapshot.dart @@ -8,7 +8,7 @@ part of firebase_storage; /// A [TaskSnapshot] is returned as the result or on-going process of a [Task]. class TaskSnapshot { TaskSnapshot._(this.storage, this._delegate) { - TaskSnapshotPlatform.verifyExtends(_delegate); + TaskSnapshotPlatform.verify(_delegate); } TaskSnapshotPlatform _delegate; diff --git a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_firebase_storage.dart b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_firebase_storage.dart index 62cc7542d4f7..7fcbb8f354ba 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_firebase_storage.dart @@ -57,7 +57,7 @@ abstract class FirebaseStoragePlatform extends PlatformInterface { /// Sets the [FirebaseStoragePlatform.instance] static set instance(FirebaseStoragePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + PlatformInterface.verify(instance, _token); _instance = instance; } diff --git a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_list_result.dart b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_list_result.dart index aeca1e5fa29d..9c53541f8a05 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_list_result.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_list_result.dart @@ -4,6 +4,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../firebase_storage_platform_interface.dart'; /// Result returned by [list]. @@ -19,8 +20,8 @@ abstract class ListResultPlatform extends PlatformInterface { /// This is used by the app-facing [Reference] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(ListResultPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(ListResultPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The [FirebaseStoragePlatform] used when fetching list items. diff --git a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_reference.dart b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_reference.dart index 9c10b45d9e97..86e005220308 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_reference.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_reference.dart @@ -8,6 +8,7 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../firebase_storage_platform_interface.dart'; import '../internal/pointer.dart'; @@ -28,8 +29,8 @@ abstract class ReferencePlatform extends PlatformInterface { /// This is used by the app-facing [Reference] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(ReferencePlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(ReferencePlatform instance) { + PlatformInterface.verify(instance, _token); } /// The storage service associated with this reference. diff --git a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task.dart b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task.dart index 49b2b9d90523..d144a681153b 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task.dart @@ -6,6 +6,7 @@ import 'dart:async'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../firebase_storage_platform_interface.dart'; /// The interface a task must implement. @@ -21,8 +22,8 @@ abstract class TaskPlatform extends PlatformInterface { /// This is used by the app-facing [Task] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(TaskPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(TaskPlatform instance) { + PlatformInterface.verify(instance, _token); } /// Returns a [Stream] of [TaskSnapshot] events. diff --git a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task_snapshot.dart b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task_snapshot.dart index 2f5c431cee09..846b5d3582bf 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task_snapshot.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/lib/src/platform_interface/platform_interface_task_snapshot.dart @@ -4,6 +4,7 @@ // found in the LICENSE file. import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + import '../../firebase_storage_platform_interface.dart'; /// The interface a task snapshot must extend. @@ -23,8 +24,8 @@ abstract class TaskSnapshotPlatform extends PlatformInterface { /// This is used by the app-facing [TaskSnapshot] to ensure that /// the object in which it's going to delegate calls has been /// constructed properly. - static void verifyExtends(TaskSnapshotPlatform instance) { - PlatformInterface.verifyToken(instance, _token); + static void verify(TaskSnapshotPlatform instance) { + PlatformInterface.verify(instance, _token); } /// The current transferred bytes of this task. 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 index c50182b8634e..cdc387afbd65 100644 --- 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 @@ -32,10 +32,10 @@ void main() { expect(listResultPlatform, isA()); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - ListResultPlatform.verifyExtends(listResultPlatform!); + ListResultPlatform.verify(listResultPlatform!); return; } catch (_) { fail('thrown an unexpected exception'); 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 index 139441af5c89..0db7760e3925 100644 --- 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 @@ -32,10 +32,10 @@ void main() { expect(referencePlatform, isA()); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - ReferencePlatform.verifyExtends(referencePlatform!); + ReferencePlatform.verify(referencePlatform!); return; } catch (_) { fail('thrown an unexpected exception'); diff --git a/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_task_test.dart b/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_task_test.dart index a9b4686ab8a9..19a89ab797a2 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_task_test.dart +++ b/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_task_test.dart @@ -28,10 +28,10 @@ void main() { expect(taskPlatform, isA()); }); - group('verifyExtends()', () { + group('verify()', () { test('calls successfully', () { try { - TaskPlatform.verifyExtends(taskPlatform!); + TaskPlatform.verify(taskPlatform!); return; } catch (_) { fail('thrown an unexpected exception'); From c843ebf8711838ad6f2448e4a2b5d7537605df71 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 11 Oct 2022 14:05:50 +0200 Subject: [PATCH 2/5] fix: remove condition for verify --- .../cloud_firestore/lib/src/collection_reference.dart | 2 +- .../lib/src/platform_interface/platform_interface_query.dart | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart b/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart index b67faa148417..adf6f9609807 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/collection_reference.dart @@ -77,7 +77,7 @@ class _JsonCollectionReference extends _JsonQuery _JsonCollectionReference( FirebaseFirestore firestore, CollectionReferencePlatform _delegate, - ) : super(firestore, _delegate) + ) : super(firestore, _delegate); @override CollectionReferencePlatform get _delegate => diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart index ab341d0b100e..9d9cacaf1084 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_query.dart @@ -37,9 +37,7 @@ abstract class QueryPlatform extends PlatformInterface { /// the object in which it's going to delegate calls has been /// constructed properly. static void verify(QueryPlatform instance) { - if (instance is! CollectionReferencePlatform) { - PlatformInterface.verify(instance, _token); - } + PlatformInterface.verify(instance, _token); } /// The [FirebaseFirestorePlatform] interface for this current query. From 76fd91cc2ace68eba2678aa976b614dc52cd17ec Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Wed, 12 Oct 2022 11:41:13 +0200 Subject: [PATCH 3/5] fix: fix verify --- .../cloud_firestore/lib/src/firestore.dart | 4 +--- .../cloud_functions/lib/src/firebase_functions.dart | 4 +--- .../firebase_analytics/lib/src/firebase_analytics.dart | 4 +--- .../firebase_app_check/lib/src/firebase_app_check.dart | 4 +--- .../lib/src/firebase_app_installations.dart | 4 +--- .../firebase_auth/lib/src/firebase_auth.dart | 4 +--- .../platform_interface_recaptcha_verifier_factory.dart | 2 +- ...form_interface_recaptcha_verifier_factory_test.dart | 2 +- .../lib/src/firebase_crashlytics.dart | 5 +---- .../firebase_database/lib/src/firebase_database.dart | 1 - .../firebase_database/lib/src/query.dart | 4 +++- .../platform_interface/platform_interface_query.dart | 10 ++++++++++ .../lib/src/firebase_dynamic_links.dart | 4 +--- .../lib/firebase_in_app_messaging.dart | 4 +--- .../firebase_messaging/lib/src/messaging.dart | 4 +--- .../lib/src/firebase_ml_model_downloader.dart | 4 +--- .../lib/src/firebase_performance.dart | 4 +--- .../lib/src/firebase_remote_config.dart | 8 ++++---- .../firebase_storage/lib/src/firebase_storage.dart | 4 +--- 19 files changed, 32 insertions(+), 48 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart index ba79a0aef98e..b05988df82fd 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart @@ -17,9 +17,7 @@ part of cloud_firestore; /// ``` class FirebaseFirestore extends FirebasePluginPlatform { FirebaseFirestore._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_firestore') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_firestore'); static final Map _cachedInstances = {}; diff --git a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart index 2c1a0275e626..732b5f07296d 100644 --- a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart +++ b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart @@ -11,9 +11,7 @@ part of cloud_functions; class FirebaseFunctions extends FirebasePluginPlatform { FirebaseFunctions._({required this.app, String? region}) : _region = region ??= 'us-central1', - super(app.name, 'plugins.flutter.io/firebase_functions') { - FirebasePluginPlatform.verify(instance); - } + super(app.name, 'plugins.flutter.io/firebase_functions'); // Cached and lazily loaded instance of [FirebaseFunctionsPlatform] to avoid // creating a [MethodChannelFirebaseFunctions] when not needed or creating an diff --git a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart index 5fb6bde5442a..621e8cbae759 100755 --- a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart +++ b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart @@ -7,9 +7,7 @@ part of firebase_analytics; /// Firebase Analytics API. class FirebaseAnalytics extends FirebasePluginPlatform { FirebaseAnalytics._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_analytics') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_analytics'); /// Namespace for analytics API available on Android only. This is deprecated in favor of /// `FirebaseAnalytics.instance.setSessionTimeoutDuration()`. diff --git a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart index 7c632be9698d..12abdca99bed 100644 --- a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart +++ b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart @@ -9,9 +9,7 @@ class FirebaseAppCheck extends FirebasePluginPlatform { static Map _firebaseAppCheckInstances = {}; FirebaseAppCheck._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_check') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_app_check'); /// Cached instance of [FirebaseAppCheck]; static FirebaseAppCheck? _instance; diff --git a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart index f62ca4179024..443946d7c06f 100644 --- a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart +++ b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart @@ -6,9 +6,7 @@ part of firebase_app_installations; class FirebaseInstallations extends FirebasePluginPlatform { FirebaseInstallations._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_installations') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_app_installations'); // Cached and lazily loaded instance of [FirebaseAppInstallationsPlatform] to avoid // creating a [MethodChannelFirebaseInstallations] when not needed or creating an diff --git a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart index 44ded36b36d2..22f0f226e4b0 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart @@ -37,9 +37,7 @@ class FirebaseAuth extends FirebasePluginPlatform { FirebaseAuth._({required this.app, Persistence? persistence}) : _persistence = persistence, - super(app.name, 'plugins.flutter.io/firebase_auth') { - FirebasePluginPlatform.verify(instance); - } + super(app.name, 'plugins.flutter.io/firebase_auth'); /// Returns an instance using the default [FirebaseApp]. static FirebaseAuth get instance { diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart index 65fb3241aae6..7a3befbc7ff2 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart @@ -66,7 +66,7 @@ abstract class RecaptchaVerifierFactoryPlatform extends PlatformInterface { } /// Ensures that a delegate class extends [RecaptchaVerifierFactoryPlatform]. - static void verify(RecaptchaVerifierFactoryPlatform instance) { + static void verifyExtends(RecaptchaVerifierFactoryPlatform instance) { PlatformInterface.verify(instance, _token); } diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart index a33a1b365049..1e538d219237 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart @@ -46,7 +46,7 @@ void main() { group('verify()', () { test('calls successfully', () { try { - RecaptchaVerifierFactoryPlatform.verify( + RecaptchaVerifierFactoryPlatform.verifyExtends( recaptchaVerifierFactoryPlatform); return; } catch (_) { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart index 310991db3c8e..00b9bb27ea6e 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart @@ -10,9 +10,7 @@ part of firebase_crashlytics; /// You can get an instance by calling [FirebaseCrashlytics.instance]. class FirebaseCrashlytics extends FirebasePluginPlatform { FirebaseCrashlytics._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_crashlytics') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_crashlytics'); /// Cached instance of [FirebaseCrashlytics]; static FirebaseCrashlytics? _instance; @@ -33,7 +31,6 @@ class FirebaseCrashlytics extends FirebasePluginPlatform { /// Returns an instance using the default [FirebaseApp]. static FirebaseCrashlytics get instance { _instance ??= FirebaseCrashlytics._(app: Firebase.app()); - return _instance!; } diff --git a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart index cc8f8e2e589b..1a1373b6bd0e 100644 --- a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart +++ b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart @@ -21,7 +21,6 @@ class FirebaseDatabase extends FirebasePluginPlatform { FirebaseDatabase._({required this.app, this.databaseURL}) : super(app.name, 'plugins.flutter.io/firebase_database') { - FirebasePluginPlatform.verify(instance); if (databaseURL != null && databaseURL!.endsWith('/')) { databaseURL = databaseURL!.substring(0, databaseURL!.length - 1); } diff --git a/packages/firebase_database/firebase_database/lib/src/query.dart b/packages/firebase_database/firebase_database/lib/src/query.dart index c34e537f624a..e0312687a50d 100644 --- a/packages/firebase_database/firebase_database/lib/src/query.dart +++ b/packages/firebase_database/firebase_database/lib/src/query.dart @@ -7,7 +7,9 @@ part of firebase_database; /// Represents a query over the data at a particular location. class Query { Query._(this._queryDelegate, [QueryModifiers? modifiers]) - : _modifiers = modifiers ?? QueryModifiers([]); + : _modifiers = modifiers ?? QueryModifiers([]) { + QueryPlatform.verify(_queryDelegate); + } final QueryPlatform _queryDelegate; diff --git a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_query.dart b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_query.dart index 2c3204d2b446..157e9b7eee10 100755 --- a/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_query.dart +++ b/packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_query.dart @@ -12,6 +12,16 @@ abstract class QueryPlatform extends PlatformInterface { static final Object _token = Object(); + /// Throws an [AssertionError] if [instance] does not extend + /// [QueryPlatform]. + /// + /// This is used by the app-facing [Query] to ensure that + /// the object in which it's going to delegate calls has been + /// constructed properly. + static void verify(QueryPlatform instance) { + PlatformInterface.verify(instance, _token); + } + /// Create a [QueryPlatform] instance QueryPlatform({ required this.database, diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart index 5f4c17fcc4cf..034fea588e0e 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart @@ -9,9 +9,7 @@ part of firebase_dynamic_links; /// You can get an instance by calling [FirebaseDynamicLinks.instance]. class FirebaseDynamicLinks extends FirebasePluginPlatform { FirebaseDynamicLinks._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_dynamic_links') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_dynamic_links'); static final Map _cachedInstances = {}; diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart index 4a2a68bca5da..857c0f25c376 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart @@ -9,9 +9,7 @@ import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_mes class FirebaseInAppMessaging extends FirebasePluginPlatform { FirebaseInAppMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging'); /// The [FirebaseApp] for this current [FirebaseAnalytics] instance. final FirebaseApp app; diff --git a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart index 9d1daf4539f1..c1bd9ce38f4b 100644 --- a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart +++ b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart @@ -25,9 +25,7 @@ class FirebaseMessaging extends FirebasePluginPlatform { FirebaseApp app; FirebaseMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_messaging') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_messaging'); /// Returns an instance using the default [FirebaseApp]. static FirebaseMessaging get instance { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart index 7a3ed559dd3b..f5661a9ca0d3 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart @@ -6,9 +6,7 @@ part of firebase_ml_model_downloader; class FirebaseModelDownloader extends FirebasePluginPlatform { FirebaseModelDownloader._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader'); // Cached and lazily loaded instance of [FirebaseModelDownloaderPlatform] to avoid // creating a [MethodChannelFirebaseFunctions] when not needed or creating an diff --git a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart index dada0c9fbc87..a26fd2454a7c 100644 --- a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart +++ b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart @@ -9,9 +9,7 @@ part of firebase_performance; /// You can get an instance by calling [FirebasePerformance.instance]. class FirebasePerformance extends FirebasePluginPlatform { FirebasePerformance._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_performance') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_performance'); // Cached and lazily loaded instance of [FirebasePerformancePlatform] to avoid // creating a [MethodChannelFirebasePerformance] when not needed or creating an diff --git a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart index 3667731bc350..d07d072c3045 100644 --- a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart @@ -11,9 +11,7 @@ part of firebase_remote_config; // ignore: prefer_mixin class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { FirebaseRemoteConfig._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_remote_config') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_remote_config'); // Cached instances of [FirebaseRemoteConfig]. static final Map @@ -39,7 +37,9 @@ class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { /// Returns an instance using the specified [FirebaseApp]. static FirebaseRemoteConfig instanceFor({required FirebaseApp app}) { return _firebaseRemoteConfigInstances.putIfAbsent(app.name, () { - return FirebaseRemoteConfig._(app: app); + final instance = FirebaseRemoteConfig._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart index a8da0739c390..d8521b3b335d 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart @@ -8,9 +8,7 @@ part of firebase_storage; /// The entrypoint for [FirebaseStorage]. class FirebaseStorage extends FirebasePluginPlatform { FirebaseStorage._({required this.app, required this.bucket}) - : super(app.name, 'plugins.flutter.io/firebase_storage') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_storage'); // Cached and lazily loaded instance of [FirebaseStoragePlatform] to avoid // creating a [MethodChannelStorage] when not needed or creating an From 40a4bbeb4ed74af6986d555587f09fd3ce8f63b9 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Wed, 12 Oct 2022 12:01:12 +0200 Subject: [PATCH 4/5] fix: fix verify --- .../lib/src/firebase_remote_config.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart index d07d072c3045..7f41e29a817c 100644 --- a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart @@ -37,9 +37,7 @@ class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { /// Returns an instance using the specified [FirebaseApp]. static FirebaseRemoteConfig instanceFor({required FirebaseApp app}) { return _firebaseRemoteConfigInstances.putIfAbsent(app.name, () { - final instance = FirebaseRemoteConfig._(app: app); - FirebasePluginPlatform.verify(instance); - return instance; + return FirebaseRemoteConfig._(app: app); }); } From 29b86e05c3f57a881054b43cc215749364a10a21 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Thu, 13 Oct 2022 15:14:46 +0200 Subject: [PATCH 5/5] fix: bump plugin_platform_inteface version --- .../cloud_firestore_platform_interface/pubspec.yaml | 2 +- packages/cloud_functions/cloud_functions/pubspec.yaml | 2 +- .../cloud_functions_platform_interface/pubspec.yaml | 2 +- .../firebase_analytics_platform_interface/pubspec.yaml | 2 +- packages/firebase_app_check/firebase_app_check/pubspec.yaml | 2 +- .../firebase_app_check_platform_interface/pubspec.yaml | 2 +- .../firebase_app_installations/pubspec.yaml | 2 +- .../firebase_app_installations_platform_interface/pubspec.yaml | 2 +- packages/firebase_auth/firebase_auth/pubspec.yaml | 2 +- .../firebase_auth/firebase_auth_platform_interface/pubspec.yaml | 2 +- packages/firebase_core/firebase_core/pubspec.yaml | 2 +- .../firebase_core/firebase_core_platform_interface/pubspec.yaml | 2 +- .../firebase_crashlytics_platform_interface/pubspec.yaml | 2 +- .../firebase_database_platform_interface/pubspec.yaml | 2 +- .../firebase_dynamic_links_platform_interface/pubspec.yaml | 2 +- .../firebase_in_app_messaging_platform_interface/pubspec.yaml | 2 +- .../firebase_messaging/firebase_messaging/example/pubspec.yaml | 2 +- packages/firebase_messaging/firebase_messaging/pubspec.yaml | 2 +- .../firebase_messaging_platform_interface/pubspec.yaml | 2 +- .../firebase_ml_model_downloader/pubspec.yaml | 2 +- .../pubspec.yaml | 2 +- packages/firebase_performance/firebase_performance/pubspec.yaml | 2 +- .../firebase_remote_config/firebase_remote_config/pubspec.yaml | 2 +- .../firebase_remote_config_platform_interface/pubspec.yaml | 2 +- packages/firebase_storage/firebase_storage/pubspec.yaml | 2 +- .../firebase_storage_platform_interface/pubspec.yaml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml index 8e9901b0ca5a..b5c2e19935a3 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index 164238fb642a..124725fcd40c 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -24,7 +24,7 @@ dev_dependencies: sdk: flutter flutter_test: sdk: flutter - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml b/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml index 9e49c27ac3b0..b253fe6ec8ef 100644 --- a/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml b/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml index 6cb82854b781..333a95db6afa 100644 --- a/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index ff137e0cf144..456ced681122 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -24,7 +24,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml b/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml index 1b185781cc95..f16548da49ab 100644 --- a/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index fe1c068f6f0b..650a7514987f 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -26,7 +26,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.16 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: 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 b2d178ed7189..c701f565f8b4 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 @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index 7ab59d461771..7cb1a2351a03 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -27,7 +27,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml index d8a5efecd3e7..3ef8a7ee6f24 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index ca2a507335eb..6397878bf0c6 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -23,7 +23,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml index 7fa1e10db04d..9f71b47d7811 100644 --- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml +++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: flutter_test: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: mockito: ^5.0.0 diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml index 26debb053127..6faa51a64bd2 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml index e06bfdfbc102..8ecd585cb952 100755 --- a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml +++ b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/pubspec.yaml b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/pubspec.yaml index 8e94aee7fb8d..5386a6f9946c 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/pubspec.yaml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml index d19ffe2407bd..0918382b10ab 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index aa32f6c5d6e1..75970bd90d96 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -31,7 +31,7 @@ dependency_overrides: firebase_messaging_web: path: ../../firebase_messaging_web # Override for `flutter_local_notifications`: - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 flutter: uses-material-design: true diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index 52f53e61e895..342a293ffdde 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -26,7 +26,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml b/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml index 39b18e4ee8be..a181e8ac4570 100644 --- a/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml index a282b481432d..0e01bdf3b733 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml @@ -24,7 +24,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/pubspec.yaml index d448e93b4667..979a7cdedcd4 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index d5223d08fd00..1fac46655e3c 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -31,7 +31,7 @@ dev_dependencies: http: ^0.13.0 mockito: ^5.0.0 pedantic: ^1.8.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index bfcce6c78072..5ec3acb1080e 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -26,7 +26,7 @@ dev_dependencies: sdk: flutter mockito: ^5.0.0 pedantic: ^1.8.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml index cb43a663c9ca..1bf339f3cf46 100644 --- a/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1 diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index 4904e9374eac..c24a156e3559 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -25,7 +25,7 @@ dev_dependencies: sdk: flutter http: ^0.13.0 mockito: ^5.0.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 test: any flutter: diff --git a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml index 1d6d2453b650..3e8db8ba696f 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter: sdk: flutter meta: ^1.3.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.5.1