Skip to content

Commit

Permalink
attempt to fix firebase crash
Browse files Browse the repository at this point in the history
  • Loading branch information
maxisme committed Oct 30, 2021
1 parent 735fcbb commit 9886d9c
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 124 deletions.
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<string>10.0</string>
</dict>
</plist>
5 changes: 4 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '10.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -37,5 +37,8 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
end
end
end
32 changes: 16 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
PODS:
- "app_settings (3.0.0+1)":
- Flutter
- Firebase/CoreOnly (8.7.0):
- FirebaseCore (= 8.7.0)
- Firebase/Messaging (8.7.0):
- Firebase/CoreOnly (8.8.0):
- FirebaseCore (= 8.8.0)
- Firebase/Messaging (8.8.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 8.7.0)
- firebase_core (1.7.0):
- Firebase/CoreOnly (= 8.7.0)
- FirebaseMessaging (~> 8.8.0)
- firebase_core (1.8.0):
- Firebase/CoreOnly (= 8.8.0)
- Flutter
- firebase_messaging (10.0.8):
- Firebase/Messaging (= 8.7.0)
- firebase_messaging (10.0.9):
- Firebase/Messaging (= 8.8.0)
- firebase_core
- Flutter
- FirebaseCore (8.7.0):
- FirebaseCore (8.8.0):
- FirebaseCoreDiagnostics (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
Expand All @@ -27,7 +27,7 @@ PODS:
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/UserDefaults (~> 7.4)
- PromisesObjC (< 3.0, >= 1.2)
- FirebaseMessaging (8.7.0):
- FirebaseMessaging (8.8.0):
- FirebaseCore (~> 8.0)
- FirebaseInstallations (~> 8.0)
- GoogleDataTransport (~> 9.0)
Expand Down Expand Up @@ -155,13 +155,13 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
app_settings: d103828c9f5d515c4df9ee754dabd443f7cedcf3
Firebase: bc9325d5ee2041524bac78a5213d0e530c651309
firebase_core: f5ac1f2726a2bd0468cea0161eddeea3d83d7e3e
firebase_messaging: cfee8830477d2f1875e027a65cce7f6239ebf583
FirebaseCore: f4804c1d3f4bbbefc88904d15653038f2c99ddf7
Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814
firebase_core: 3b4c707f5a8eff38f52fd5580895bcd89357bf42
firebase_messaging: c2570c4b5aeb1b9dc1b40a3b4a246e246cd583a8
FirebaseCore: 98b29e3828f0a53651c363937a7f7d92a19f1ba2
FirebaseCoreDiagnostics: fe77f42da6329d6d83d21fd9d621a6b704413bfc
FirebaseInstallations: 2563cb18a723ef9c6ef18318a49519b75dce613c
FirebaseMessaging: 93227dd71d7888e200baef65043f81acb2b6596e
FirebaseMessaging: 419b5c9d84f294a753c6501d8cfb9ced1ce37304
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_app_icon_badge: 844847adbd7a1c6f325d6b41b942428981b839cc
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
Expand All @@ -180,6 +180,6 @@ SPEC CHECKSUMS:
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649

PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
PODFILE CHECKSUM: 3efef3e4c4241ddf19165efb8229df7447127bfd

COCOAPODS: 1.11.0

This file was deleted.

150 changes: 75 additions & 75 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>it.notifi.notifi</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>notifi</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppleMusicUsageDescription</key>
<string>We don't access apple music</string>
<key>NSBonjourServices</key>
<array>
<string>_dartobservatory._tcp</string>
</array>
<key>NSCalendarsUsageDescription</key>
<string>We don't access your calendar</string>
<key>NSContactsUsageDescription</key>
<string>We don't access your contacts</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>We don't use location data</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We don't use location data</string>
<key>NSMotionUsageDescription</key>
<string>We don't access motion</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>FLogs would like to save photos from the app to your gallery</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>FLogs would like to access your photo gallery for uploading images to the app</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>We don't access speech recognition</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIStatusBarHidden</key>
<false/>
</dict>
</plist>
<dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>it.notifi.notifi</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>notifi</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppleMusicUsageDescription</key>
<string>We don&apos;t access apple music</string>
<key>NSBonjourServices</key>
<array>
<string>_dartobservatory._tcp</string>
</array>
<key>NSCalendarsUsageDescription</key>
<string>We don&apos;t access your calendar</string>
<key>NSContactsUsageDescription</key>
<string>We don&apos;t access your contacts</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>We don&apos;t use location data</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We don&apos;t use location data</string>
<key>NSMotionUsageDescription</key>
<string>We don&apos;t access motion</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>FLogs would like to save photos from the app to your gallery</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>FLogs would like to access your photo gallery for uploading images to the app</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>We don&apos;t access speech recognition</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIStatusBarHidden</key>
<false/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ import 'package:sqflite/sqflite.dart';
Future<void> main() => mainImpl();

Future<void> mainImpl({bool integration: false}) async {
Globals.isIntegration = integration;
WidgetsFlutterBinding.ensureInitialized();
final SharedPreferences sp = await SharedPreferences.getInstance();
Globals.isIntegration = integration;

// initialise db for linux & windows
if (!isTest && (Platform.isWindows || Platform.isLinux)) {
Expand All @@ -42,7 +43,6 @@ Future<void> mainImpl({bool integration: false}) async {
}

if (Platform.isMacOS) {
final SharedPreferences sp = await SharedPreferences.getInstance();
await invokeMacMethod(
'set-pin-window', <String, bool>{'transient': !shouldPinWindow(sp)});
await invokeMacMethod(
Expand Down
32 changes: 16 additions & 16 deletions macos/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
PODS:
- desktop_window (0.0.1):
- FlutterMacOS
- Firebase/CoreOnly (8.7.0):
- FirebaseCore (= 8.7.0)
- Firebase/Messaging (8.7.0):
- Firebase/CoreOnly (8.8.0):
- FirebaseCore (= 8.8.0)
- Firebase/Messaging (8.8.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 8.7.0)
- firebase_core (1.7.0):
- Firebase/CoreOnly (~> 8.7.0)
- FirebaseMessaging (~> 8.8.0)
- firebase_core (1.8.0):
- Firebase/CoreOnly (~> 8.8.0)
- FlutterMacOS
- firebase_messaging (10.0.8):
- Firebase/CoreOnly (~> 8.7.0)
- Firebase/Messaging (~> 8.7.0)
- firebase_messaging (10.0.9):
- Firebase/CoreOnly (~> 8.8.0)
- Firebase/Messaging (~> 8.8.0)
- firebase_core
- FlutterMacOS
- FirebaseCore (8.7.0):
- FirebaseCore (8.8.0):
- FirebaseCoreDiagnostics (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
Expand All @@ -28,7 +28,7 @@ PODS:
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/UserDefaults (~> 7.4)
- PromisesObjC (< 3.0, >= 1.2)
- FirebaseMessaging (8.7.0):
- FirebaseMessaging (8.8.0):
- FirebaseCore (~> 8.0)
- FirebaseInstallations (~> 8.0)
- GoogleDataTransport (~> 9.0)
Expand Down Expand Up @@ -159,13 +159,13 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
desktop_window: fb7c4f12c1129f947ac482296b6f14059d57a3c3
Firebase: bc9325d5ee2041524bac78a5213d0e530c651309
firebase_core: 9b4e9961fbb05a0c25b20f69b96221e3f3c23159
firebase_messaging: 67e702b1c1c6ede0df033250afdcce9b2f6ff96c
FirebaseCore: f4804c1d3f4bbbefc88904d15653038f2c99ddf7
Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814
firebase_core: 9f800648da0325ed3ee3bb31198be55c08a42389
firebase_messaging: a938a3d73c188f98e54c694c1f2264fcb94c912d
FirebaseCore: 98b29e3828f0a53651c363937a7f7d92a19f1ba2
FirebaseCoreDiagnostics: fe77f42da6329d6d83d21fd9d621a6b704413bfc
FirebaseInstallations: 2563cb18a723ef9c6ef18318a49519b75dce613c
FirebaseMessaging: 93227dd71d7888e200baef65043f81acb2b6596e
FirebaseMessaging: 419b5c9d84f294a753c6501d8cfb9ced1ce37304
flutter_app_icon_badge: 099b018a4b36109fb73874411fb4e8b5febac20e
flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
flutter_secure_storage: 06c397200165bbea69a0071437f9d690f5e5c0a2
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ dependencies:
app_settings: ^4.1.0
cached_network_image: ^3.1.0
dio: ^4.0.0
firebase_core: ^1.7.0
firebase_messaging: ^10.0.7
firebase_core: ^1.8.0
firebase_messaging: ^10.0.9
flutter:
sdk: flutter
flutter_app_icon_badge: ^2.0.0
flutter_dotenv: ^5.0.0
flutter_emoji: ^2.2.1+1
flutter_local_notifications: ^9.0.0-dev.2
flutter_local_notifications: ^9.0.2
flutter_secure_storage:
git:
url: git://github.com/openresearch/flutter_secure_storage.git
ref: feature/macos_support
flutter_slidable: ^0.6.0
intl: ^0.17.0
json_serializable: ^4.1.4
json_serializable: ^6.0.1
launch_at_login: ^0.0.3
package_info_plus: ^1.0.4
launch_review: ^3.0.1
package_info: ^2.0.0
path_provider: ^2.0.2
provider: ^6.0.0
pull_to_refresh: ^2.0.0
share_plus: ^2.1.4
share_plus: ^3.0.2
shared_preferences: ^2.0.6
sqflite: ^2.0.0+3
sqflite_common_ffi: ^2.0.0+1
Expand Down

0 comments on commit 9886d9c

Please sign in to comment.