From 5b4d8282aebcc9fbe0fac71eda00e9dfcd028fc8 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Fri, 16 Aug 2024 22:59:34 +0800 Subject: [PATCH] :heavy_plus_sign: Re-google (firebase) --- android/app/build.gradle | 1 + android/settings.gradle | 1 + ios/Podfile.lock | 113 ++++++++++++++++-- ios/Runner.xcodeproj/project.pbxproj | 19 +++ lib/firebase_options.dart | 3 +- lib/main.dart | 39 +++--- linux/flutter/generated_plugin_registrant.cc | 4 - linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 6 +- macos/Runner.xcodeproj/project.pbxproj | 19 +++ pubspec.lock | 56 ++++++--- pubspec.yaml | 5 +- .../flutter/generated_plugin_registrant.cc | 3 - windows/flutter/generated_plugins.cmake | 1 - 14 files changed, 210 insertions(+), 61 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fe2e814..9f352e1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,6 +1,7 @@ plugins { id "com.android.application" id 'com.google.gms.google-services' + id 'com.google.firebase.crashlytics' id "kotlin-android" id "dev.flutter.flutter-gradle-plugin" } diff --git a/android/settings.gradle b/android/settings.gradle index aa1295c..5631f9f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -20,6 +20,7 @@ plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version '8.4.0' apply false id "com.google.gms.google-services" version "4.3.15" apply false + id "com.google.firebase.crashlytics" version "2.8.1" apply false id "org.jetbrains.kotlin.android" version '2.0.0' apply false } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6f71ed4..b25437a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -38,24 +38,69 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - Firebase/Analytics (10.29.0): + - Firebase/Core + - Firebase/Core (10.29.0): + - Firebase/CoreOnly + - FirebaseAnalytics (~> 10.29.0) - Firebase/CoreOnly (10.29.0): - FirebaseCore (= 10.29.0) + - Firebase/Crashlytics (10.29.0): + - Firebase/CoreOnly + - FirebaseCrashlytics (~> 10.29.0) - Firebase/Messaging (10.29.0): - Firebase/CoreOnly - FirebaseMessaging (~> 10.29.0) + - firebase_analytics (11.2.1): + - Firebase/Analytics (= 10.29.0) + - firebase_core + - Flutter - firebase_core (3.3.0): - Firebase/CoreOnly (= 10.29.0) - Flutter + - firebase_crashlytics (4.0.4): + - Firebase/Crashlytics (= 10.29.0) + - firebase_core + - Flutter - firebase_messaging (15.0.4): - Firebase/Messaging (= 10.29.0) - firebase_core - Flutter + - FirebaseAnalytics (10.29.0): + - FirebaseAnalytics/AdIdSupport (= 10.29.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (10.29.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.29.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) - FirebaseCore (10.29.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) + - FirebaseCoreExtension (10.29.0): + - FirebaseCore (~> 10.0) - FirebaseCoreInternal (10.29.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.29.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseRemoteConfigInterop (~> 10.23) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesObjC (~> 2.1) - FirebaseInstallations (10.29.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) @@ -70,6 +115,16 @@ PODS: - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30911.0, >= 2.30908.0) + - FirebaseRemoteConfigInterop (10.29.0) + - FirebaseSessions (10.29.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.13) + - GoogleUtilities/UserDefaults (~> 7.13) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) - Flutter (1.0.0) - flutter_keyboard_visibility (0.0.1): - Flutter @@ -81,6 +136,26 @@ PODS: - gal (1.0.0): - Flutter - FlutterMacOS + - GoogleAppMeasurement (10.29.0): + - GoogleAppMeasurement/AdIdSupport (= 10.29.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (10.29.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.29.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (10.29.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30911.0, >= 2.30908.0) @@ -96,6 +171,9 @@ PODS: - GoogleUtilities/Logger (7.13.3): - GoogleUtilities/Environment - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (7.13.3): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy - GoogleUtilities/Network (7.13.3): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" @@ -141,6 +219,8 @@ PODS: - pointer_interceptor_ios (0.0.1): - Flutter - PromisesObjC (2.4.0) + - PromisesSwift (2.4.0): + - PromisesObjC (= 2.4.0) - protocol_handler_ios (0.0.1): - Flutter - screen_brightness_ios (0.1.0): @@ -148,11 +228,6 @@ PODS: - SDWebImage (5.19.6): - SDWebImage/Core (= 5.19.6) - SDWebImage/Core (5.19.6) - - Sentry/HybridSDK (8.33.0) - - sentry_flutter (8.7.0): - - Flutter - - FlutterMacOS - - Sentry/HybridSDK (= 8.33.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -175,7 +250,9 @@ DEPENDENCIES: - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) + - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) @@ -195,7 +272,6 @@ DEPENDENCIES: - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`) - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`) - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/darwin`) @@ -208,16 +284,22 @@ SPEC REPOS: - DKImagePickerController - DKPhotoGallery - Firebase + - FirebaseAnalytics - FirebaseCore + - FirebaseCoreExtension - FirebaseCoreInternal + - FirebaseCrashlytics - FirebaseInstallations - FirebaseMessaging + - FirebaseRemoteConfigInterop + - FirebaseSessions + - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities - nanopb - PromisesObjC + - PromisesSwift - SDWebImage - - Sentry - SwiftyGif - TOCropViewController - WebRTC-SDK @@ -229,8 +311,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info_plus/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + firebase_analytics: + :path: ".symlinks/plugins/firebase_analytics/ios" firebase_core: :path: ".symlinks/plugins/firebase_core/ios" + firebase_crashlytics: + :path: ".symlinks/plugins/firebase_crashlytics/ios" firebase_messaging: :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: @@ -269,8 +355,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/protocol_handler_ios/ios" screen_brightness_ios: :path: ".symlinks/plugins/screen_brightness_ios/ios" - sentry_flutter: - :path: ".symlinks/plugins/sentry_flutter/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: @@ -291,17 +375,25 @@ SPEC CHECKSUMS: DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d + firebase_analytics: 04491d1ee74c8e7c2330c96afc54188a969b06ee firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb + firebase_crashlytics: e3d3e0c99bad5aaab5908385133dea8ec344693f firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757 + FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16 + FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 + FirebaseCrashlytics: 34647b41e18de773717fdd348a22206f2f9bc774 FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366 + FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d + FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1 + GoogleAppMeasurement: f9de05ee17401e3355f68e8fc8b5064d429f5918 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf @@ -317,11 +409,10 @@ SPEC CHECKSUMS: permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 protocol_handler_ios: a5db8abc38526ee326988b808be621e5fd568990 screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625 SDWebImage: a79252b60f4678812d94316c91da69ec83089c9f - Sentry: 8560050221424aef0bebc8e31eedf00af80f90a6 - sentry_flutter: e26b861f744e5037a3faf9bf56603ec65d658a61 share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c5c6900..44314ce 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -263,6 +263,7 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 287A33C298CA352A7E7F32A4 /* [CP] Embed Pods Frameworks */, 0818E8E4321C0D7433E07576 /* [CP] Copy Pods Resources */, + 1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */, ); buildRules = ( ); @@ -365,6 +366,24 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; + 1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\""; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n"; + }; 259653AE41D478F4C6BAE9B2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart index c6667f8..a1481c1 100644 --- a/lib/firebase_options.dart +++ b/lib/firebase_options.dart @@ -85,4 +85,5 @@ class DefaultFirebaseOptions { storageBucket: 'solian-0x001.appspot.com', measurementId: 'G-EF9BZMKBC3', ); -} + +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 6a32cc2..960f540 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,7 @@ +import 'dart:ui'; + import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/material.dart'; import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:get/get.dart'; @@ -6,7 +9,6 @@ import 'package:go_router/go_router.dart'; import 'package:media_kit/media_kit.dart'; import 'package:protocol_handler/protocol_handler.dart'; import 'package:provider/provider.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:solian/bootstrapper.dart'; import 'package:solian/firebase_options.dart'; import 'package:solian/platform.dart'; @@ -29,32 +31,29 @@ import 'package:solian/translations.dart'; import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy; void main() async { - await SentryFlutter.init( - (options) { - options.dsn = - 'https://55438cdff9048aa2225df72fdc629c42@o4506965897117696.ingest.us.sentry.io/4507357676437504'; - options.tracesSampleRate = 1.0; - options.profilesSampleRate = 1.0; - }, - appRunner: () async { - WidgetsFlutterBinding.ensureInitialized(); - MediaKit.ensureInitialized(); + WidgetsFlutterBinding.ensureInitialized(); + MediaKit.ensureInitialized(); - await Future.wait([ - _initializeFirebase(), - _initializePlatformComponents(), - ]); + await Future.wait([ + _initializeFirebase(), + _initializePlatformComponents(), + ]); - GoRouter.optionURLReflectsImperativeAPIs = true; + GoRouter.optionURLReflectsImperativeAPIs = true; - usePathUrlStrategy(); - runApp(const SolianApp()); - }, - ); + usePathUrlStrategy(); + runApp(const SolianApp()); } Future _initializeFirebase() async { await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); + FlutterError.onError = (errorDetails) { + FirebaseCrashlytics.instance.recordFlutterFatalError(errorDetails); + }; + PlatformDispatcher.instance.onError = (error, stack) { + FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); + return true; + }; } Future _initializePlatformComponents() async { diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index d87abc4..63960ac 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -14,7 +14,6 @@ #include #include #include -#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -42,9 +41,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) pasteboard_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin"); pasteboard_plugin_register_with_registrar(pasteboard_registrar); - g_autoptr(FlPluginRegistrar) sentry_flutter_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin"); - sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index aa52fbf..5705c88 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -11,7 +11,6 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_libs_linux media_kit_video pasteboard - sentry_flutter url_launcher_linux ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 8cfdef3..34686c2 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,7 +9,9 @@ import connectivity_plus import desktop_drop import device_info_plus import file_selector_macos +import firebase_analytics import firebase_core +import firebase_crashlytics import firebase_messaging import flutter_secure_storage_macos import flutter_webrtc @@ -23,7 +25,6 @@ import pasteboard import path_provider_foundation import protocol_handler_macos import screen_brightness_macos -import sentry_flutter import share_plus import shared_preferences_foundation import sqflite @@ -35,7 +36,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) + FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin")) FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin")) @@ -49,7 +52,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) ProtocolHandlerMacosPlugin.register(with: registry.registrar(forPlugin: "ProtocolHandlerMacosPlugin")) ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin")) - SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 929885d..7cc0873 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -288,6 +288,7 @@ 3399D490228B24CF009A79C7 /* ShellScript */, C5DDC734703B72E778163C68 /* [CP] Embed Pods Frameworks */, 7009C53F1F4A3CB93BB64EF3 /* [CP] Copy Pods Resources */, + 230664685E2D9269C5BF6747 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */, ); buildRules = ( ); @@ -400,6 +401,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 230664685E2D9269C5BF6747 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\""; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=macos --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n"; + }; 291CAD95BC748648C4154147 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/pubspec.lock b/pubspec.lock index 08db503..b980a17 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -446,6 +446,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.9.3+2" + firebase_analytics: + dependency: "direct main" + description: + name: firebase_analytics + sha256: "064e5b57b0693305946b7caa6a80ed80a918f46804c247b6cd7ed9cd327df48f" + url: "https://pub.dev" + source: hosted + version: "11.2.1" + firebase_analytics_platform_interface: + dependency: transitive + description: + name: firebase_analytics_platform_interface + sha256: d094547c9022c404b5ca39b7209607fc80e75e39d38875f050508fa4346b3e74 + url: "https://pub.dev" + source: hosted + version: "4.2.1" + firebase_analytics_web: + dependency: transitive + description: + name: firebase_analytics_web + sha256: "06dc023b0144c0df630a56b6262cc9e7d6069fe78148853d97614dbefb6ea923" + url: "https://pub.dev" + source: hosted + version: "0.5.9+1" firebase_core: dependency: "direct main" description: @@ -470,6 +494,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.17.4" + firebase_crashlytics: + dependency: "direct main" + description: + name: firebase_crashlytics + sha256: "30260e1b8ad1464b41ca4531b44ce63d752daaf2f12c92ca6cdcd82b270abecc" + url: "https://pub.dev" + source: hosted + version: "4.0.4" + firebase_crashlytics_platform_interface: + dependency: transitive + description: + name: firebase_crashlytics_platform_interface + sha256: a75e1826d92ea4e86e4a753c7b5d64b844a362676fa653185f1581c859186d18 + url: "https://pub.dev" + source: hosted + version: "3.6.40" firebase_messaging: dependency: "direct main" description: @@ -1557,22 +1597,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.2" - sentry: - dependency: transitive - description: - name: sentry - sha256: "0f787e27ff617e4f88f7074977240406a9c5509444bac64a4dfa5b3200fb5632" - url: "https://pub.dev" - source: hosted - version: "8.7.0" - sentry_flutter: - dependency: "direct main" - description: - name: sentry_flutter - sha256: fbbb47d72ccca48be25bf3c2ced6ab6e872991af3a0ba78e54be8d138f2e053f - url: "https://pub.dev" - source: hosted - version: "8.7.0" share_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 6742de8..434daec 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: solian description: "The Solar Network App" publish_to: "none" -version: 1.2.1+13 +version: 1.2.1+14 environment: sdk: ">=3.3.4 <4.0.0" @@ -36,7 +36,6 @@ dependencies: flutter_webrtc: ^0.11.4 wakelock_plus: ^1.2.5 cached_network_image: ^3.3.1 - sentry_flutter: ^8.2.0 firebase_core: ^3.0.0 firebase_messaging: ^15.0.0 package_info_plus: ^8.0.0 @@ -69,6 +68,8 @@ dependencies: field_suggestion: ^0.2.5 flutter_typeahead: ^5.2.0 collection: ^1.18.0 + firebase_crashlytics: ^4.0.4 + firebase_analytics: ^11.2.1 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index f307a7b..a0fca33 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -56,8 +55,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("ProtocolHandlerWindowsPluginCApi")); ScreenBrightnessWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin")); - SentryFlutterPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("SentryFlutterPlugin")); SharePlusWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index de2568f..b666aba 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -18,7 +18,6 @@ list(APPEND FLUTTER_PLUGIN_LIST permission_handler_windows protocol_handler_windows screen_brightness_windows - sentry_flutter share_plus url_launcher_windows )