feat: update librairies to be compatible with Flutter 3.10.0 (#10944)

Remove intl dependency and use JS to parse the date in firebase_auth_web. Fix formatting issues * feat: update librairies to be compatible with Flutter 3.10.0 * feat: update librairies to be compatible with Flutter 3.10.0 * intl to 0.18.0 to match flutter_localizations * removing intl and do the parsing using JS
firebase · May 11, 2023 · e1f5a5e · e1f5a5e
1 parent c56234f
commit e1f5a5e
Show file tree

Hide file tree

Showing 43 changed files with 98 additions and 86 deletions.
diff --git a/packages/cloud_firestore/cloud_firestore/test/aggregate_query_test.dart b/packages/cloud_firestore/cloud_firestore/test/aggregate_query_test.dart
@@ -21,7 +21,7 @@ void main() {
     StandardMethodCodec(AggregateQueryMessageCodec()),
   );
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
           (call) async {
     if (call.method == 'AggregateQuery#count') {

diff --git a/packages/cloud_firestore/cloud_firestore/test/document_reference_test.dart b/packages/cloud_firestore/cloud_firestore/test/document_reference_test.dart
@@ -18,7 +18,7 @@ void main() {
     StandardMethodCodec(TestFirestoreMessageCodec()),
   );
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
           (call) async {
     return null;

diff --git a/packages/cloud_firestore/cloud_firestore/test/document_snapshot_test.dart b/packages/cloud_firestore/cloud_firestore/test/document_snapshot_test.dart
@@ -19,7 +19,7 @@ void main() {
     StandardMethodCodec(TestFirestoreMessageCodec()),
   );
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
           (call) async {
     DocumentReferencePlatform ref = call.arguments['reference'];

diff --git a/packages/cloud_firestore/cloud_firestore/test/write_batch_test.dart b/packages/cloud_firestore/cloud_firestore/test/write_batch_test.dart
@@ -14,7 +14,7 @@ void main() {
   FirebaseFirestore? firestore;
   FirebaseFirestore? firestoreSecondary;
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
           (call) async {
     String path = call.arguments['path'];

diff --git a/...oud_firestore_platform_interface/test/method_channel_tests/method_channel_query_test.dart b/...oud_firestore_platform_interface/test/method_channel_tests/method_channel_query_test.dart
@@ -122,7 +122,7 @@ void main() {
     });
     group('get()', () {
       setUp(() async {
-        TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
                 (MethodCall methodCall) async {
           switch (methodCall.method) {

diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/test/utils/test_common.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/test/utils/test_common.dart
@@ -40,7 +40,7 @@ void initializeMethodChannel() {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseFirestore.channel,
             (call) async {
       return await methodCallCallback(call);
@@ -51,13 +51,13 @@ void handleDocumentSnapshotsEventChannel(
   final name = 'plugins.flutter.io/firebase_firestore/document/$id';
   const codec = StandardMethodCodec(TestFirestoreMessageCodec());
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name, codec),
           (MethodCall methodCall) async {
     log.add(methodCall);
     switch (methodCall.method) {
       case 'listen':
-        await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
           name,
           codec.encodeSuccessEnvelope(
@@ -84,13 +84,13 @@ void handleQuerySnapshotsEventChannel(final String id, List<MethodCall> log) {
   final name = 'plugins.flutter.io/firebase_firestore/query/$id';
   const codec = StandardMethodCodec(TestFirestoreMessageCodec());
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name, codec),
           (MethodCall methodCall) async {
     log.add(methodCall);
     switch (methodCall.method) {
       case 'listen':
-        await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
           name,
           codec.encodeSuccessEnvelope(
@@ -117,12 +117,12 @@ void handleSnapshotsInSyncEventChannel(final String id) {
   final name = 'plugins.flutter.io/firebase_firestore/snapshotsInSync/$id';
   const codec = StandardMethodCodec(TestFirestoreMessageCodec());
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name, codec),
           (MethodCall methodCall) async {
     switch (methodCall.method) {
       case 'listen':
-        await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
                 name, codec.encodeSuccessEnvelope({}), (_) {});
         break;
@@ -142,12 +142,12 @@ void handleTransactionEventChannel(
   final name = 'plugins.flutter.io/firebase_firestore/transaction/$id';
   const codec = StandardMethodCodec(TestFirestoreMessageCodec());
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name, codec),
           (MethodCall methodCall) async {
     switch (methodCall.method) {
       case 'listen':
-        await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
           name,
           codec.encodeSuccessEnvelope({
@@ -158,19 +158,19 @@ void handleTransactionEventChannel(
 
         if (throwException!) {
           await TestDefaultBinaryMessengerBinding
-              .instance?.defaultBinaryMessenger
+              .instance.defaultBinaryMessenger
               .handlePlatformMessage(
             name,
             codec.encodeSuccessEnvelope({
-              'appName': app?.name,
+              'appName': app.name,
               'error': {
                 'code': 'unknown',
               },
             }),
             (_) {},
           );
         }
-        await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
           name,
           codec.encodeSuccessEnvelope({

diff --git a/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart b/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart
@@ -22,7 +22,7 @@ void setupFirebaseFunctionsMocks([Callback? customHandlers]) {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseFunctions.channel,
             (call) async {
       return await methodCallCallback(call);

diff --git a/packages/firebase_analytics/firebase_analytics/test/mock.dart b/packages/firebase_analytics/firebase_analytics/test/mock.dart
@@ -16,7 +16,7 @@ void setupFirebaseAnalyticsMocks([Callback? customHandlers]) {
 
   setupFirebaseCoreMocks();
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseAnalytics.channel,
           (MethodCall methodCall) async {
     methodCallLog.add(methodCall);

diff --git a/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart b/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart
@@ -17,7 +17,7 @@ void setupFirebaseAnalyticsMocks([Callback? customHandlers]) {
 
   setupFirebaseCoreMocks();
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseAnalytics.channel,
           (MethodCall methodCall) async {
     methodCallLog.add(methodCall);
@@ -32,7 +32,7 @@ void setupFirebaseAnalyticsMocks([Callback? customHandlers]) {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseAnalytics.channel,
             (call) async {
       return await methodCallCallback(call);

diff --git a/packages/firebase_app_check/firebase_app_check/test/mock.dart b/packages/firebase_app_check/firebase_app_check/test/mock.dart
@@ -16,7 +16,7 @@ void setupFirebaseAppCheckMocks([Callback? customHandlers]) {
 
   setupFirebaseCoreMocks();
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseAppCheck.channel,
           (MethodCall methodCall) async {
     if (methodCall.method != 'FirebaseAppCheck#registerTokenListener') {

diff --git a/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart b/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart
@@ -18,7 +18,7 @@ void setupFirebaseAppCheckMocks([Callback? customHandlers]) {
 
   setupFirebaseCoreMocks();
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseAppCheck.channel,
           (MethodCall methodCall) async {
     methodCallLog.add(methodCall);
@@ -30,7 +30,7 @@ void setupFirebaseAppCheckMocks([Callback? customHandlers]) {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseAppCheck.channel,
             (call) async {
       return await methodCallCallback(call);

diff --git a/packages/firebase_auth/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/firebase_auth/test/firebase_auth_test.dart
@@ -171,7 +171,7 @@ void main() {
       when(mockAuthPlatform.userChanges()).thenAnswer((_) =>
           Stream<UserPlatform>.fromIterable(<UserPlatform>[mockUserPlatform!]));
 
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(MethodChannelFirebaseAuth.channel,
               (call) async {
         return <String, dynamic>{'user': user};

diff --git a/packages/firebase_auth/firebase_auth/test/user_test.dart b/packages/firebase_auth/firebase_auth/test/user_test.dart
@@ -130,7 +130,7 @@ void main() {
         languageCode: anyNamed('languageCode'),
       )).thenAnswer((_) => mockAuthPlatform);
 
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(MethodChannelFirebaseAuth.channel,
               (call) async {
         switch (call.method) {

diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart
@@ -27,7 +27,7 @@ void handleEventChannel(
   final String name, [
   List<MethodCall>? log,
 ]) {
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name),
           (MethodCall methodCall) async {
     log?.add(methodCall);
@@ -46,7 +46,7 @@ Future<void> injectEventChannelResponse(
   String channelName,
   Map<String, dynamic> event,
 ) async {
-  await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .handlePlatformMessage(
     channelName,
     MethodChannelFirebaseAuth.channel.codec.encodeSuccessEnvelope(event),
@@ -55,14 +55,14 @@ Future<void> injectEventChannelResponse(
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseAuth.channel,
             (call) async {
       return await methodCallCallback(call);
     });
 
 Future<void> simulateEvent(String name, Map<String, dynamic>? user) async {
-  await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .handlePlatformMessage(
     MethodChannelFirebaseAuth.channel.name,
     MethodChannelFirebaseAuth.channel.codec.encodeMethodCall(

diff --git a/packages/firebase_auth/firebase_auth_web/lib/src/firebase_auth_web_user.dart b/packages/firebase_auth/firebase_auth_web/lib/src/firebase_auth_web_user.dart
@@ -4,18 +4,15 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js';
 
 import 'package:firebase_auth_platform_interface/firebase_auth_platform_interface.dart';
 import 'package:firebase_auth_web/src/firebase_auth_web_user_credential.dart';
-import 'package:intl/intl.dart';
 
 import 'firebase_auth_web_confirmation_result.dart';
 import 'interop/auth.dart' as auth_interop;
 import 'utils/web_utils.dart';
 
-/// The format of an incoming metadata string timestamp from the firebase-dart library
-final DateFormat _dateFormat = DateFormat('EEE, d MMM yyyy HH:mm:ss', 'en_US');
-
 /// Web delegate implementation of [UserPlatform].
 class UserWeb extends UserPlatform {
   /// Creates a new [UserWeb] instance.
@@ -31,14 +28,12 @@ class UserWeb extends UserPlatform {
           'isAnonymous': _webUser.isAnonymous,
           'metadata': <String, int?>{
             'creationTime': _webUser.metadata.creationTime != null
-                ? _dateFormat
-                    .parse(_webUser.metadata.creationTime!, true)
-                    .millisecondsSinceEpoch
+                ? context['Date']
+                    .callMethod('parse', [_webUser.metadata.creationTime])
                 : null,
             'lastSignInTime': _webUser.metadata.lastSignInTime != null
-                ? _dateFormat
-                    .parse(_webUser.metadata.lastSignInTime!, true)
-                    .millisecondsSinceEpoch
+                ? context['Date']
+                    .callMethod('parse', [_webUser.metadata.lastSignInTime])
                 : null,
           },
           'phoneNumber': _webUser.phoneNumber,

diff --git a/packages/firebase_auth/firebase_auth_web/pubspec.yaml b/packages/firebase_auth/firebase_auth_web/pubspec.yaml
@@ -17,7 +17,6 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   http_parser: ^4.0.0
-  intl: ^0.17.0
   js: ^0.6.3
   meta: ^1.8.0
 

diff --git a/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart b/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart
@@ -70,7 +70,7 @@ void setupFirebaseCrashlyticsMocks([Callback? customHandlers]) {
 
   TestFirebaseCoreHostApi.setup(MockFirebaseAppWithCollectionEnabled());
 
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannelFirebaseCrashlytics.channel,
           (MethodCall methodCall) async {
     methodCallLog.add(methodCall);

diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart
@@ -18,7 +18,7 @@ void setupFirebaseCrashlyticsMocks([Callback? customHandlers]) {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseCrashlytics.channel,
             (call) async {
       return await methodCallCallback(call);

diff --git a/...ages/firebase_database/firebase_database_platform_interface/test/method_channel_test.dart b/...ages/firebase_database/firebase_database_platform_interface/test/method_channel_test.dart
@@ -30,7 +30,7 @@ void main() {
     );
 
     messenger =
-        TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger;
+        TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger;
   });
 
   group('MethodChannelDatabase', () {
@@ -45,7 +45,7 @@ void main() {
     setUp(() async {
       database = MethodChannelDatabase(app: app, databaseURL: databaseURL);
 
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
         log.add(methodCall);
 
@@ -454,7 +454,7 @@ void main() {
 
         Future<void> simulateError(String errorMessage) async {
           await TestDefaultBinaryMessengerBinding
-              .instance?.defaultBinaryMessenger
+              .instance.defaultBinaryMessenger
               .handlePlatformMessage(
             eventChannel.name,
             eventChannel.codec.encodeErrorEnvelope(
@@ -502,7 +502,7 @@ void main() {
 
         Future<void> simulateEvent(Map<String, dynamic> event) async {
           await TestDefaultBinaryMessengerBinding
-              .instance?.defaultBinaryMessenger
+              .instance.defaultBinaryMessenger
               .handlePlatformMessage(
             eventChannel.name,
             eventChannel.codec.encodeSuccessEnvelope(event),

diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/lib/main.dart b/packages/firebase_dynamic_links/firebase_dynamic_links/example/lib/main.dart
@@ -165,7 +165,7 @@ class _MainScreenState extends State<_MainScreen> {
                     },
                     onLongPress: () {
                       if (_linkMessage != null) {
-                        Clipboard.setData(ClipboardData(text: _linkMessage));
+                        Clipboard.setData(ClipboardData(text: _linkMessage!));
                         ScaffoldMessenger.of(context).showSnackBar(
                           const SnackBar(content: Text('Copied Link!')),
                         );

diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart
@@ -21,7 +21,7 @@ void setupFirebaseDynamicLinksMocks([Callback? customHandlers]) {
 }
 
 void handleMethodCall(MethodCallCallback methodCallCallback) =>
-    TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(MethodChannelFirebaseDynamicLinks.channel,
             (call) async {
       return await methodCallCallback(call);
@@ -31,7 +31,7 @@ void handleEventChannel(
   final String name, [
   List<MethodCall>? log,
 ]) {
-  TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .setMockMethodCallHandler(MethodChannel(name),
           (MethodCall methodCall) async {
     log?.add(methodCall);
@@ -50,7 +50,7 @@ Future<void> injectEventChannelResponse(
   String channelName,
   Map<String, dynamic> event,
 ) async {
-  await TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+  await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
       .handlePlatformMessage(
     channelName,
     MethodChannelFirebaseDynamicLinks.channel.codec