Merge remote-tracking branch 'origin/master'

equalitie · Sep 4, 2023 · 789d0ad · 789d0ad
2 parents fa19872 + b8ac282
commit 789d0ad
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 130 deletions.
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -4,15 +4,14 @@ import 'dart:ui';
 
 import 'package:collection/collection.dart';
 import 'package:desktop_drop/desktop_drop.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:loggy/loggy.dart';
 import 'package:ouisync_plugin/ouisync_plugin.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 
 import '../generated/l10n.dart';
 import 'cubits/cubits.dart';
@@ -242,7 +241,6 @@ void _setupErrorReporting() {
 void _onError(FlutterErrorDetails details) {
   logError("Unhandled Exception:", details.exception, details.stack);
 
-  if (Firebase.apps.isNotEmpty) {
-    unawaited(FirebaseCrashlytics.instance.recordFlutterFatalError(details));
-  }
+  unawaited(
+      Sentry.captureException(details.exception, stackTrace: details.stack));
 }
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
diff --git a/pubspec.lock b/pubspec.lock
@@ -9,14 +9,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "61.0.0"
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      sha256: "9ebe81588e666f7e2b21309f2b5653bd9642d7f27fd0a6894278d2ff40cb9481"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
   analyzer:
     dependency: transitive
     description:
@@ -409,46 +401,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
-  firebase_core:
-    dependency: "direct main"
-    description:
-      name: firebase_core
-      sha256: e9b36b391690cf329c6fb1de220045e97c13784c303820cd33962319580a56c6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.1"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.8.0"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      sha256: "8c0f4c87d20e2d001a5915df238c1f9c88704231f591324205f5a5d2a7740a45"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  firebase_crashlytics:
-    dependency: "direct main"
-    description:
-      name: firebase_crashlytics
-      sha256: "603f23a74995c193cae89a784b8da529b1e6a91c03bc63f885f36456e9e867a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.2"
-  firebase_crashlytics_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_crashlytics_platform_interface
-      sha256: cefeeeb98abdb9d848581603bd1e33a2a8e6d3ed937586cb84437e606049071b
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.2"
   fixnum:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.7.0-beta+46
+version: 0.7.2-beta+47
 
 environment:
   sdk: ">=2.18.1 <4.0.0"
@@ -43,8 +43,6 @@ dependencies:
   file: ^6.1.4
   file_picker: ^5.2.5
   filesystem_picker: ^3.1.0
-  firebase_core: ^2.3.0
-  firebase_crashlytics: ^3.0.6
   flutter:
     sdk: flutter
   # Fix for the issue "[BUG] Release 1.2.0 is broken"

diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -9,7 +9,6 @@
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <desktop_drop/desktop_drop_plugin.h>
 #include <desktop_webview_window/desktop_webview_window_plugin.h>
-#include <firebase_core/firebase_core_plugin_c_api.h>
 #include <local_auth_windows/local_auth_plugin.h>
 #include <ouisync_plugin/ouisync_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
@@ -30,8 +29,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DesktopDropPlugin"));
   DesktopWebviewWindowPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin"));
-  FirebaseCorePluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   LocalAuthPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LocalAuthPlugin"));
   OuisyncPluginRegisterWithRegistrar(

diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -6,7 +6,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
   desktop_drop
   desktop_webview_window
-  firebase_core
   local_auth_windows
   ouisync_plugin
   permission_handler_windows

diff --git a/windows/inno-setup.iss.template b/windows/inno-setup.iss.template
@@ -68,14 +68,14 @@ Source: "{#SourcePath}..\build\windows\runner\Release\connectivity_plus_plugin.d
 Source: "{#SourcePath}..\build\windows\runner\Release\desktop_drop_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\desktop_webview_window_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\dokan2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#SourcePath}..\build\windows\runner\Release\firebase_core_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\local_auth_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\ouisync_ffi.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\ouisync_plugin_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\permission_handler_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\r_get_ip_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\screen_retriever_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#SourcePath}..\build\windows\runner\Release\sentry_flutter_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\share_plus_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\system_tray_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}..\build\windows\runner\Release\tray_manager_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion