Update Firebase dependencies (#199)

Author: daohoangson

.gitattributes

@@ -4,9 +4,12 @@
 /android/fastlane/service-account.json filter=git-crypt diff=git-crypt
 /android/release.jks filter=git-crypt diff=git-crypt
 /ios/Runner/GoogleService-Info.plist filter=git-crypt diff=git-crypt
+/ios/firebase_app_id_file.json filter=git-crypt diff=git-crypt
 /ios/gc_keys.json filter=git-crypt diff=git-crypt
+/lib/firebase_options.dart filter=git-crypt diff=git-crypt
 /macos/Runner/GoogleService-Info.plist filter=git-crypt diff=git-crypt
 /macos/fastlane/4TV2PTBPVG.json filter=git-crypt diff=git-crypt
+/macos/firebase_app_id_file.json filter=git-crypt diff=git-crypt
 /macos/gc_keys.json filter=git-crypt diff=git-crypt
 /windows/ca.crt filter=git-crypt diff=git-crypt
 /windows/certificate.pfx filter=git-crypt diff=git-crypt

README.md

@@ -90,6 +90,7 @@ Pick a unique package name across Play Store and App Store then update these fil
 - `macos/fastlane/Matchfile`
 - `windows/runner/Runner.rc`
 - `pubspec.yaml` msix_config>identity_name
+- Re-run `flutterfire configure` to update Firebase apps
 
 You will also need to move the files within `android/app/src/main/java/com/daohoangson/flutter_ttdemo` to another directory to match the new Android package.
 

android/app/google-services.json

@@ -15,58 +15,63 @@ PODS:
   - FBSDKCoreKit_Basics (16.1.3)
   - FBSDKLoginKit (16.1.3):
     - FBSDKCoreKit (= 16.1.3)
-  - Firebase/CoreOnly (9.6.0):
-    - FirebaseCore (= 9.6.0)
-  - Firebase/Crashlytics (9.6.0):
+  - Firebase/CoreOnly (10.12.0):
+    - FirebaseCore (= 10.12.0)
+  - Firebase/Crashlytics (10.12.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 9.6.0)
-  - Firebase/Messaging (9.6.0):
+    - FirebaseCrashlytics (~> 10.12.0)
+  - Firebase/Messaging (10.12.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 9.6.0)
-  - firebase_core (1.24.0):
-    - Firebase/CoreOnly (= 9.6.0)
+    - FirebaseMessaging (~> 10.12.0)
+  - firebase_core (2.15.0):
+    - Firebase/CoreOnly (= 10.12.0)
     - Flutter
-  - firebase_crashlytics (2.9.0):
-    - Firebase/Crashlytics (= 9.6.0)
+  - firebase_crashlytics (3.3.4):
+    - Firebase/Crashlytics (= 10.12.0)
     - firebase_core
     - Flutter
-  - firebase_messaging (13.1.0):
-    - Firebase/Messaging (= 9.6.0)
+  - firebase_messaging (14.6.5):
+    - Firebase/Messaging (= 10.12.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (9.6.0):
-    - FirebaseCoreDiagnostics (~> 9.0)
-    - FirebaseCoreInternal (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/Logger (~> 7.7)
-  - FirebaseCoreDiagnostics (9.6.0):
-    - GoogleDataTransport (< 10.0.0, >= 9.1.4)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/Logger (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseCoreInternal (9.6.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-  - FirebaseCrashlytics (9.6.0):
-    - FirebaseCore (~> 9.0)
-    - FirebaseInstallations (~> 9.0)
-    - GoogleDataTransport (< 10.0.0, >= 9.1.4)
-    - GoogleUtilities/Environment (~> 7.7)
+  - FirebaseCore (10.12.0):
+    - FirebaseCoreInternal (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Logger (~> 7.8)
+  - FirebaseCoreExtension (10.13.0):
+    - FirebaseCore (~> 10.0)
+  - FirebaseCoreInternal (10.13.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+  - FirebaseCrashlytics (10.12.0):
+    - FirebaseCore (~> 10.5)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseSessions (~> 10.5)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.8)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesObjC (~> 2.1)
-  - FirebaseInstallations (9.6.0):
-    - FirebaseCore (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/UserDefaults (~> 7.7)
+  - FirebaseInstallations (10.13.0):
+    - FirebaseCore (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (9.6.0):
-    - FirebaseCore (~> 9.0)
-    - FirebaseInstallations (~> 9.0)
-    - GoogleDataTransport (< 10.0.0, >= 9.1.4)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/Reachability (~> 7.7)
-    - GoogleUtilities/UserDefaults (~> 7.7)
+  - FirebaseMessaging (10.12.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - FirebaseSessions (10.13.0):
+    - FirebaseCore (~> 10.5)
+    - FirebaseCoreExtension (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.10)
     - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesSwift (~> 2.1)
   - Flutter (1.0.0)
   - flutter_facebook_auth (6.0.1):
     - FBSDKLoginKit (~> 16.1.3)
@@ -123,6 +128,8 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.3.1)
+  - PromisesSwift (2.3.1):
+    - PromisesObjC (= 2.3.1)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -176,11 +183,12 @@ SPEC REPOS:
     - FBSDKLoginKit
     - Firebase
     - FirebaseCore
-    - FirebaseCoreDiagnostics
+    - FirebaseCoreExtension
     - FirebaseCoreInternal
     - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseMessaging
+    - FirebaseSessions
     - FMDB
     - GoogleDataTransport
     - GoogleSignIn
@@ -189,6 +197,7 @@ SPEC REPOS:
     - GTMSessionFetcher
     - nanopb
     - PromisesObjC
+    - PromisesSwift
 
 EXTERNAL SOURCES:
   audio_session:
@@ -241,16 +250,17 @@ SPEC CHECKSUMS:
   FBSDKCoreKit: 19e2e18b3be578d7a51fed8fdd8c152bef0b9511
   FBSDKCoreKit_Basics: dd9826ce3c9fd9f8cdf8dbbd0ef0a53e6c0c9e7e
   FBSDKLoginKit: c395c63a1a6cf4a8a1e6103fd94b8c46329ee81c
-  Firebase: 5ae8b7cf8efce559a653aef0ad95bab3f427c351
-  firebase_core: 7c28ecc1e5dd74e03829ac3e9ff5ba3314e737a9
-  firebase_crashlytics: 520a59314eaaadb34f9be4c2a285d99cfa88ebdb
-  firebase_messaging: a2a8c6db6d799c7f59b1c0d7c68a2f0027bfa2c4
-  FirebaseCore: 2082fffcd855f95f883c0a1641133eb9bbe76d40
-  FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6
-  FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
-  FirebaseCrashlytics: 3210572ddb77801e5a0bd9d7bc890769f2066a0c
-  FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
-  FirebaseMessaging: a4d7910e4af663c9cbfc1071c5bef34651690949
+  Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
+  firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00
+  firebase_crashlytics: 6043ce85800f96e53f15ee5051f9cfad10cce73d
+  firebase_messaging: 334d68c3a36b6d4d5cd91e4f42509e0d4ae49828
+  FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
+  FirebaseCoreExtension: ce60f9db46d83944cf444664d6d587474128eeca
+  FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
+  FirebaseCrashlytics: c4d111b7430c49744c74bcc6346ea00868661ac8
+  FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
+  FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316
+  FirebaseSessions: 991fb4c20b3505eef125f7cbfa20a5b5b189c2a4
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_facebook_auth: 47c7a8594f2d6864618e30b5a6d59dff0d2e59fe
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
@@ -267,6 +277,7 @@ SPEC CHECKSUMS:
   package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a

ios/Podfile.lock

@@ -23,41 +23,47 @@ void main() async {
 
   WidgetsFlutterBinding.ensureInitialized();
   await firebase.initializeApp();
+  error_reporting.configureErrorReporting();
   push_notification.configurePushNotification();
 
-  error_reporting.runZoned<Future<void>>(() async {
-    final values = await Future.wait([
-      DarkTheme.create(),
-      FontScale.create(),
-      push_notification.getInitialPath(),
-      uni_links.getInitialLink(),
-      DevTools.create(),
-    ]);
+  DarkTheme? darkTheme;
+  DevTools? devTools;
+  FontScale? fontScale;
+  String? initialLink;
+  String? initialPath;
+  await Future.wait([
+    DarkTheme.create().then((value) => darkTheme = value),
+    FontScale.create().then((value) => fontScale = value),
+    DevTools.create().then((value) => devTools = value),
+    uni_links.getInitialLink().then((value) => initialLink = value),
+    firebase.initializeApp().then((value) async {
+      error_reporting.configureErrorReporting();
+      push_notification.configurePushNotification();
+      initialPath = await push_notification.getInitialPath();
+    }),
+  ]);
 
-    String? initialPath;
-    Widget? defaultWidget;
-    String? fallbackLink;
-    if (values[2] != null) {
-      initialPath = values[2] as String?;
-      defaultWidget = const NotificationListScreen();
-    } else if (values[3] != null) {
-      initialPath = buildToolsParseLinkPath(values[3] as String);
-      fallbackLink = values[3] as String?;
-    }
+  Widget? defaultWidget;
+  String? fallbackLink;
+  if (initialPath != null) {
+    defaultWidget = const NotificationListScreen();
+  } else if (initialLink != null) {
+    initialPath = buildToolsParseLinkPath(initialLink!);
+    fallbackLink = initialLink;
+  }
 
-    runApp(MyApp(
-      darkTheme: values[0] as DarkTheme,
-      devTools: values[4] as DevTools,
-      fontScale: values[1] as FontScale,
-      home: initialPath != null
-          ? InitialPathScreen(
-              initialPath,
-              defaultWidget: defaultWidget,
-              fallbackLink: fallbackLink,
-            )
-          : HomeScreen(),
-    ));
-  });
+  runApp(MyApp(
+    darkTheme: darkTheme!,
+    devTools: devTools!,
+    fontScale: fontScale!,
+    home: initialPath != null
+        ? InitialPathScreen(
+            initialPath!,
+            defaultWidget: defaultWidget,
+            fallbackLink: fallbackLink,
+          )
+        : HomeScreen(),
+  ));
 }
 
 class MyApp extends StatelessWidget {

ios/Runner/GoogleService-Info.plist

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/foundation.dart';
 
@@ -8,19 +6,18 @@ import 'firebase.dart' as firebase;
 final backend =
     firebase.isSupported ? Backend.firebaseCrashlytics : Backend.none;
 
-void crash() => FirebaseCrashlytics.instance.crash();
+void configureErrorReporting() {
+  if (backend == Backend.none) return;
 
-// ignore: missing_return
-R? runZoned<R>(R Function() body) {
-  switch (backend) {
-    case Backend.firebaseCrashlytics:
-      FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
-      return runZonedGuarded(body, FirebaseCrashlytics.instance.recordError);
-    case Backend.none:
-      return body();
-  }
+  FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
+  PlatformDispatcher.instance.onError = (error, stack) {
+    FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
+    return true;
+  };
 }
 
+void crash() => FirebaseCrashlytics.instance.crash();
+
 enum Backend {
   firebaseCrashlytics,
   none,

ios/firebase_app_id_file.json

@@ -1,11 +1,14 @@
 import 'dart:io';
 
 import 'package:firebase_core/firebase_core.dart';
+import 'package:the_app/firebase_options.dart';
 
 final isSupported = Platform.isAndroid || Platform.isIOS || Platform.isMacOS;
 
 Future<void> initializeApp() async {
   if (!isSupported) return;
 
-  await Firebase.initializeApp();
+  await Firebase.initializeApp(
+    options: DefaultFirebaseOptions.currentPlatform,
+  );
 }