From 07cca66ba131ea108d61566c56ecc8813e96c0ef Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 23 Jun 2026 12:08:12 +0200 Subject: [PATCH 1/2] chore: remove unused extend from PlatformInterface --- .../cloud_firestore/lib/cloud_firestore.dart | 2 +- .../cloud_firestore/lib/src/firestore.dart | 2 +- .../cloud_functions/lib/cloud_functions.dart | 2 +- .../lib/src/firebase_functions.dart | 2 +- .../firebase_ai/lib/src/firebase_ai.dart | 4 ++-- .../lib/firebase_analytics.dart | 2 +- .../lib/src/firebase_analytics.dart | 2 +- .../lib/src/firebase_app_check.dart | 3 +-- .../lib/firebase_app_installations.dart | 2 +- .../lib/src/firebase_app_installations.dart | 2 +- .../firebase_auth/lib/src/firebase_auth.dart | 2 +- .../method_channel/method_channel_firebase.dart | 5 ++--- .../method_channel_firebase_app.dart | 2 +- .../platform_interface_firebase_plugin.dart | 15 ++++----------- .../platform_interface_firebase_core_test.dart | 10 ++++++++++ .../lib/firebase_crashlytics.dart | 2 +- .../lib/src/firebase_crashlytics.dart | 2 +- .../lib/src/firebase_data_connect.dart | 2 +- .../firebase_database/lib/firebase_database.dart | 2 +- .../lib/src/firebase_database.dart | 2 +- .../lib/firebase_in_app_messaging.dart | 4 ++-- .../lib/firebase_messaging.dart | 2 +- .../firebase_messaging/lib/src/messaging.dart | 2 +- .../lib/firebase_ml_model_downloader.dart | 2 +- .../lib/src/firebase_ml_model_downloader.dart | 2 +- .../lib/src/firebase_performance.dart | 2 +- .../lib/firebase_remote_config.dart | 2 +- .../lib/src/firebase_remote_config.dart | 2 +- .../firebase_storage/lib/firebase_storage.dart | 2 +- .../lib/src/firebase_storage.dart | 2 +- 30 files changed, 45 insertions(+), 44 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/lib/cloud_firestore.dart b/packages/cloud_firestore/cloud_firestore/lib/cloud_firestore.dart index 1fcccbee21bc..6578ad8f5c9a 100755 --- a/packages/cloud_firestore/cloud_firestore/lib/cloud_firestore.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/cloud_firestore.dart @@ -5,7 +5,7 @@ import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:flutter/foundation.dart'; import 'package:meta/meta.dart'; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart index 35b09f3f5d3b..3c51c65d55c3 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart @@ -15,7 +15,7 @@ part of '../cloud_firestore.dart'; /// /// FirebaseFirestore firestore = FirebaseFirestore.instanceFor(app: secondaryApp); /// ``` -class FirebaseFirestore extends FirebasePluginPlatform { +class FirebaseFirestore extends FirebasePlugin { FirebaseFirestore._({ required this.app, required this.databaseId, diff --git a/packages/cloud_functions/cloud_functions/lib/cloud_functions.dart b/packages/cloud_functions/cloud_functions/lib/cloud_functions.dart index f95683cac2bd..3aacd08bc7e7 100644 --- a/packages/cloud_functions/cloud_functions/lib/cloud_functions.dart +++ b/packages/cloud_functions/cloud_functions/lib/cloud_functions.dart @@ -11,7 +11,7 @@ import 'dart:typed_data'; import 'package:cloud_functions_platform_interface/cloud_functions_platform_interface.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:flutter/foundation.dart'; export 'package:cloud_functions_platform_interface/cloud_functions_platform_interface.dart' 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 94a3e25e85d1..aef9a37c036a 100644 --- a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart +++ b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart @@ -8,7 +8,7 @@ part of '../cloud_functions.dart'; /// The entry point for accessing FirebaseFunctions. /// /// You can get an instance by calling [FirebaseFunctions.instance]. -class FirebaseFunctions extends FirebasePluginPlatform { +class FirebaseFunctions extends FirebasePlugin { FirebaseFunctions._({required this.app, String? region}) : _region = region ??= 'us-central1', super(app.name, 'plugins.flutter.io/firebase_functions'); diff --git a/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart b/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart index ff7011af5bce..5841c0d2de47 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart @@ -16,7 +16,7 @@ import 'package:firebase_app_check/firebase_app_check.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:http/http.dart' as http; import 'package:meta/meta.dart'; @@ -26,7 +26,7 @@ import 'base_model.dart'; const _defaultLocation = 'us-central1'; /// The entrypoint for generative models. -class FirebaseAI extends FirebasePluginPlatform { +class FirebaseAI extends FirebasePlugin { FirebaseAI._({ required this.app, required this.location, diff --git a/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart index 0b526dcc6eb4..882f04c0e743 100644 --- a/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart +++ b/packages/firebase_analytics/firebase_analytics/lib/firebase_analytics.dart @@ -5,7 +5,7 @@ import 'package:firebase_analytics_platform_interface/firebase_analytics_platform_interface.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; 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 b649a953ad6b..c67f9eb71533 100755 --- a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart +++ b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart @@ -5,7 +5,7 @@ part of '../firebase_analytics.dart'; /// Firebase Analytics API. -class FirebaseAnalytics extends FirebasePluginPlatform { +class FirebaseAnalytics extends FirebasePlugin { FirebaseAnalytics._({ required this.app, this.webOptions, 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 8deabfc99208..0553fa116e03 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 @@ -5,8 +5,7 @@ part of '../firebase_app_check.dart'; -class FirebaseAppCheck extends FirebasePluginPlatform - implements FirebaseService { +class FirebaseAppCheck extends FirebasePlugin implements FirebaseService { static Map _firebaseAppCheckInstances = {}; FirebaseAppCheck._({required this.app}) diff --git a/packages/firebase_app_installations/firebase_app_installations/lib/firebase_app_installations.dart b/packages/firebase_app_installations/firebase_app_installations/lib/firebase_app_installations.dart index 2bfd24bab7b3..44a0e46bd29c 100644 --- a/packages/firebase_app_installations/firebase_app_installations/lib/firebase_app_installations.dart +++ b/packages/firebase_app_installations/firebase_app_installations/lib/firebase_app_installations.dart @@ -5,6 +5,6 @@ import 'package:firebase_app_installations_platform_interface/firebase_app_installations_platform_interface.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; part 'src/firebase_app_installations.dart'; 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 627386b104e6..fa21dd564810 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 @@ -4,7 +4,7 @@ part of '../firebase_app_installations.dart'; -class FirebaseInstallations extends FirebasePluginPlatform { +class FirebaseInstallations extends FirebasePlugin { FirebaseInstallations._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_app_installations'); 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 2f4ebe4258f4..3c07d4b4707a 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart @@ -6,7 +6,7 @@ part of '../firebase_auth.dart'; /// The entry point of the Firebase Authentication SDK. -class FirebaseAuth extends FirebasePluginPlatform implements FirebaseService { +class FirebaseAuth extends FirebasePlugin implements FirebaseService { // Cached instances of [FirebaseAuth]. static Map _firebaseAuthInstances = {}; diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase.dart index 2cc1755614cc..dff6228fdce1 100644 --- a/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase.dart +++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase.dart @@ -33,7 +33,7 @@ class MethodChannelFirebase extends FirebasePlatform { } /// Creates and attaches a new [MethodChannelFirebaseApp] to the [MethodChannelFirebase] - /// and adds any constants to the [FirebasePluginPlatform] class. + /// and adds any constants to the [FirebasePlugin] class. void _initializeFirebaseAppFromMap(CoreInitializeResponse response) { MethodChannelFirebaseApp methodChannelFirebaseApp = MethodChannelFirebaseApp( @@ -45,8 +45,7 @@ class MethodChannelFirebase extends FirebasePlatform { appInstances[methodChannelFirebaseApp.name] = methodChannelFirebaseApp; - FirebasePluginPlatform - ._constantsForPluginApps[methodChannelFirebaseApp.name] = + FirebasePlugin._constantsForPluginApps[methodChannelFirebaseApp.name] = response.pluginConstants; } diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart index 6689c25ae0e2..1b33d6cb28a1 100644 --- a/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart +++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart @@ -52,7 +52,7 @@ class MethodChannelFirebaseApp extends FirebaseAppPlatform { await _api.delete(name); MethodChannelFirebase.appInstances.remove(name); - FirebasePluginPlatform._constantsForPluginApps.remove(name); + FirebasePlugin._constantsForPluginApps.remove(name); _isDeleted = true; } 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 afd5dcfbb499..4fbfa56034f6 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 @@ -5,14 +5,13 @@ part of '../../firebase_core_platform_interface.dart'; -/// The interface that other FlutterFire plugins must extend. +/// The base class that other FlutterFire plugins must extend. /// /// This class provides access to common plugin properties and constants which /// are available once the user has initialized FlutterFire. -abstract class FirebasePluginPlatform extends PlatformInterface { +abstract class FirebasePlugin { // ignore: public_member_api_docs - FirebasePluginPlatform(this._appName, this._methodChannelName) - : super(token: _token); + FirebasePlugin(this._appName, this._methodChannelName); /// The global data store for all constants, for each plugin and [FirebaseAppPlatform] instance. /// @@ -26,13 +25,6 @@ abstract class FirebasePluginPlatform extends PlatformInterface { final String _methodChannelName; - static final Object _token = Object(); - - // ignore: public_member_api_docs - static void verify(FirebasePluginPlatform instance) { - PlatformInterface.verify(instance, _token); - } - /// Returns any plugin constants this plugin app instance has initialized. Map get pluginConstants { final appConstants = @@ -45,3 +37,4 @@ abstract class FirebasePluginPlatform extends PlatformInterface { return {}; } } + diff --git a/packages/firebase_core/firebase_core_platform_interface/test/platform_interface_tests/platform_interface_firebase_core_test.dart b/packages/firebase_core/firebase_core_platform_interface/test/platform_interface_tests/platform_interface_firebase_core_test.dart index 63e1e24534d9..5393a22f99d8 100644 --- a/packages/firebase_core/firebase_core_platform_interface/test/platform_interface_tests/platform_interface_firebase_core_test.dart +++ b/packages/firebase_core/firebase_core_platform_interface/test/platform_interface_tests/platform_interface_firebase_core_test.dart @@ -39,6 +39,12 @@ void main() { FirebasePlatform.instance = mock; }); }); + + group('$FirebasePlugin', () { + test('is not a platform interface', () { + expect(TestFirebasePlugin(), isNot(isA())); + }); + }); } class ImplementsFirebasePlatform implements FirebasePlatform { @@ -70,3 +76,7 @@ class FirebaseCoreMockPlatform extends Mock MockPlatformInterfaceMixin implements FirebasePlatform {} + +class TestFirebasePlugin extends FirebasePlugin { + TestFirebasePlugin() : super(defaultFirebaseAppName, 'test_plugin'); +} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/lib/firebase_crashlytics.dart b/packages/firebase_crashlytics/firebase_crashlytics/lib/firebase_crashlytics.dart index 835af28b344f..800d683e306b 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/lib/firebase_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics/lib/firebase_crashlytics.dart @@ -5,7 +5,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_crashlytics_platform_interface/firebase_crashlytics_platform_interface.dart'; import 'package:flutter/foundation.dart' show DiagnosticLevel, FlutterError, FlutterErrorDetails, kDebugMode; 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 a43208f8563b..e6b07ca2efb0 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart @@ -8,7 +8,7 @@ part of '../firebase_crashlytics.dart'; /// The entry point for accessing a [FirebaseCrashlytics]. /// /// You can get an instance by calling [FirebaseCrashlytics.instance]. -class FirebaseCrashlytics extends FirebasePluginPlatform { +class FirebaseCrashlytics extends FirebasePlugin { FirebaseCrashlytics._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_crashlytics'); diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart index 45ec2f1815cd..165b6f5d62fb 100644 --- a/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart +++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart @@ -27,7 +27,7 @@ import 'cache/cache_data_types.dart'; import 'cache/cache.dart'; /// DataConnect class -class FirebaseDataConnect extends FirebasePluginPlatform { +class FirebaseDataConnect extends FirebasePlugin { /// Constructor for initializing Data Connect @visibleForTesting FirebaseDataConnect( diff --git a/packages/firebase_database/firebase_database/lib/firebase_database.dart b/packages/firebase_database/firebase_database/lib/firebase_database.dart index 1da1eb1889f1..80624a3eb319 100755 --- a/packages/firebase_database/firebase_database/lib/firebase_database.dart +++ b/packages/firebase_database/firebase_database/lib/firebase_database.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_database_platform_interface/firebase_database_platform_interface.dart'; import 'package:flutter/foundation.dart'; 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 8c71d3ff8cc6..4090063e08a4 100644 --- a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart +++ b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart @@ -6,7 +6,7 @@ part of '../firebase_database.dart'; /// The entry point for accessing a Firebase Database. You can get an instance /// by calling `FirebaseDatabase.instance` or `FirebaseDatabase.instanceFor()`. -class FirebaseDatabase extends FirebasePluginPlatform { +class FirebaseDatabase extends FirebasePlugin { FirebaseDatabase._({required this.app, this.databaseURL}) : super(app.name, 'plugins.flutter.io/firebase_database') { if (databaseURL != null && databaseURL!.endsWith('/')) { 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..ef35ef27655f 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 @@ -4,10 +4,10 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_messaging_platform_interface.dart'; -class FirebaseInAppMessaging extends FirebasePluginPlatform { +class FirebaseInAppMessaging extends FirebasePlugin { FirebaseInAppMessaging._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging'); diff --git a/packages/firebase_messaging/firebase_messaging/lib/firebase_messaging.dart b/packages/firebase_messaging/firebase_messaging/lib/firebase_messaging.dart index 6df5ee9d223a..1783d4654c91 100644 --- a/packages/firebase_messaging/firebase_messaging/lib/firebase_messaging.dart +++ b/packages/firebase_messaging/firebase_messaging/lib/firebase_messaging.dart @@ -7,7 +7,7 @@ import 'dart:async'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_messaging_platform_interface/firebase_messaging_platform_interface.dart'; export 'package:firebase_messaging_platform_interface/firebase_messaging_platform_interface.dart' diff --git a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart index de82a44a0dc1..b9f6a0ccea45 100644 --- a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart +++ b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart @@ -8,7 +8,7 @@ part of '../firebase_messaging.dart'; /// The [FirebaseMessaging] entry point. /// /// To get a new instance, call [FirebaseMessaging.instance]. -class FirebaseMessaging extends FirebasePluginPlatform { +class FirebaseMessaging extends FirebasePlugin { // Cached and lazily loaded instance of [FirebaseMessagingPlatform] to avoid // creating a [MethodChannelFirebaseMessaging] when not needed or creating an // instance with the default app before a user specifies an app. diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/firebase_ml_model_downloader.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/firebase_ml_model_downloader.dart index 6fbe5b541f75..6c741e8e81f9 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/firebase_ml_model_downloader.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/firebase_ml_model_downloader.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_ml_model_downloader_platform_interface/firebase_ml_model_downloader_platform_interface.dart'; import 'package:flutter/foundation.dart'; 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 699f318e53dd..211e751234c4 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 @@ -4,7 +4,7 @@ part of '../firebase_ml_model_downloader.dart'; -class FirebaseModelDownloader extends FirebasePluginPlatform { +class FirebaseModelDownloader extends FirebasePlugin { FirebaseModelDownloader._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader'); 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 fb044c723939..5061983318c5 100644 --- a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart +++ b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart @@ -7,7 +7,7 @@ part of '../firebase_performance.dart'; /// The Firebase Performance API. /// /// You can get an instance by calling [FirebasePerformance.instance]. -class FirebasePerformance extends FirebasePluginPlatform { +class FirebasePerformance extends FirebasePlugin { FirebasePerformance._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_performance'); diff --git a/packages/firebase_remote_config/firebase_remote_config/lib/firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config/lib/firebase_remote_config.dart index ba8c7fdcc5d0..5a23bdbb8672 100644 --- a/packages/firebase_remote_config/firebase_remote_config/lib/firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config/lib/firebase_remote_config.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_remote_config_platform_interface/firebase_remote_config_platform_interface.dart'; export 'package:firebase_remote_config_platform_interface/firebase_remote_config_platform_interface.dart' 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 6d5a5845cddb..d7ed0f77fde0 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 @@ -9,7 +9,7 @@ part of '../firebase_remote_config.dart'; /// You can get an instance by calling [FirebaseRemoteConfig.instance]. Note /// [FirebaseRemoteConfig.instance] is async. // ignore: prefer_mixin -class FirebaseRemoteConfig extends FirebasePluginPlatform { +class FirebaseRemoteConfig extends FirebasePlugin { FirebaseRemoteConfig._({required this.app}) : super(app.name, 'plugins.flutter.io/firebase_remote_config'); diff --git a/packages/firebase_storage/firebase_storage/lib/firebase_storage.dart b/packages/firebase_storage/firebase_storage/lib/firebase_storage.dart index 9a19065a691d..f93119421fd0 100755 --- a/packages/firebase_storage/firebase_storage/lib/firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage/lib/firebase_storage.dart @@ -12,7 +12,7 @@ import 'dart:io' show File; // import 'package:flutter/foundation.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart' - show FirebasePluginPlatform; + show FirebasePlugin; import 'package:firebase_storage_platform_interface/firebase_storage_platform_interface.dart'; import 'package:flutter/foundation.dart'; import 'package:mime/mime.dart'; 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 b833bfaba6e4..bc53c6bd5ef1 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart @@ -6,7 +6,7 @@ part of firebase_storage; /// The entrypoint for [FirebaseStorage]. -class FirebaseStorage extends FirebasePluginPlatform { +class FirebaseStorage extends FirebasePlugin { FirebaseStorage._({required this.app, required this.bucket}) : super(app.name, 'plugins.flutter.io/firebase_storage'); From 3df34af522ac39a142bf936f2b6263036636bdd7 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 23 Jun 2026 14:35:54 +0200 Subject: [PATCH 2/2] fix --- .../platform_interface/platform_interface_firebase_plugin.dart | 1 - 1 file changed, 1 deletion(-) 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 4fbfa56034f6..42e470fdc1b6 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 @@ -37,4 +37,3 @@ abstract class FirebasePlugin { return {}; } } -