diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 8d4492f9..ded19e29 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 10.0 diff --git a/ios/Podfile b/ios/Podfile index 1e8c3c90..fab83c66 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -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' @@ -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 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3ab512a1..2525b695 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -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) @@ -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) @@ -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 @@ -180,6 +180,6 @@ SPEC CHECKSUMS: sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: 3efef3e4c4241ddf19165efb8229df7447127bfd COCOAPODS: 1.11.0 diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 742657dc..6f32ae5c 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,78 +1,78 @@ - - BGTaskSchedulerPermittedIdentifiers - - it.notifi.notifi - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - notifi - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - FirebaseAppDelegateProxyEnabled - - LSRequiresIPhoneOS - - NSAppleMusicUsageDescription - We don't access apple music - NSBonjourServices - - _dartobservatory._tcp - - NSCalendarsUsageDescription - We don't access your calendar - NSContactsUsageDescription - We don't access your contacts - NSLocationAlwaysUsageDescription - We don't use location data - NSLocationWhenInUseUsageDescription - We don't use location data - NSMotionUsageDescription - We don't access motion - NSPhotoLibraryAddUsageDescription - FLogs would like to save photos from the app to your gallery - NSPhotoLibraryUsageDescription - FLogs would like to access your photo gallery for uploading images to the app - NSSpeechRecognitionUsageDescription - We don't access speech recognition - UIBackgroundModes - - fetch - remote-notification - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - UIStatusBarHidden - - - \ No newline at end of file + + BGTaskSchedulerPermittedIdentifiers + + it.notifi.notifi + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + notifi + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + FirebaseAppDelegateProxyEnabled + + LSRequiresIPhoneOS + + NSAppleMusicUsageDescription + We don't access apple music + NSBonjourServices + + _dartobservatory._tcp + + NSCalendarsUsageDescription + We don't access your calendar + NSContactsUsageDescription + We don't access your contacts + NSLocationAlwaysUsageDescription + We don't use location data + NSLocationWhenInUseUsageDescription + We don't use location data + NSMotionUsageDescription + We don't access motion + NSPhotoLibraryAddUsageDescription + FLogs would like to save photos from the app to your gallery + NSPhotoLibraryUsageDescription + FLogs would like to access your photo gallery for uploading images to the app + NSSpeechRecognitionUsageDescription + We don't access speech recognition + UIBackgroundModes + + fetch + remote-notification + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + UIStatusBarHidden + + + diff --git a/lib/main.dart b/lib/main.dart index 9f241cab..820bfd04 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -24,8 +24,9 @@ import 'package:sqflite/sqflite.dart'; Future main() => mainImpl(); Future 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)) { @@ -42,7 +43,6 @@ Future mainImpl({bool integration: false}) async { } if (Platform.isMacOS) { - final SharedPreferences sp = await SharedPreferences.getInstance(); await invokeMacMethod( 'set-pin-window', {'transient': !shouldPinWindow(sp)}); await invokeMacMethod( diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 7fc6c494..51dcd688 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -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) @@ -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) @@ -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 diff --git a/pubspec.yaml b/pubspec.yaml index b525b8c5..602ed6d8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,21 +24,21 @@ 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 @@ -46,7 +46,7 @@ dependencies: 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