From 5883b06fcb44f6a75c6ba489fef416371b57b570 Mon Sep 17 00:00:00 2001 From: "Aamir.Muhammad" Date: Thu, 26 Sep 2024 16:24:44 +0300 Subject: [PATCH] Updated to 3.24 Flutter & Penguin Fixed. --- ios/Podfile | 13 ++++++++++++- ios/Runner.xcodeproj/project.pbxproj | 5 ++++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/AppDelegate.swift | 2 +- .../inpatient_pending_advance_payment.dart | 2 +- lib/pages/livecare/video-call-web-page.dart | 2 +- lib/widgets/in_app_browser/InAppBrowser.dart | 16 ++++++++-------- pubspec.yaml | 15 ++++++++------- 8 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index f6415e64..5564c00b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -33,7 +33,7 @@ target 'Runner' do pod 'OpenTok', '~> 2.22.0' pod 'VTO2Lib' - pod 'MapboxMaps', '10.16.4' + pod 'MapboxMaps', '10.18.2' flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end @@ -64,6 +64,17 @@ post_install do |installer| if build_configuration.build_settings['WRAPPER_EXTENSION'] == 'bundle' build_configuration.build_settings['DEVELOPMENT_TEAM'] = '3A359E86ZF' end + if target.name == 'MapboxMobileEvents' + `xcrun -sdk iphoneos bitcode_strip -r Pods/MapboxMobileEvents/MapboxMobileEvents.xcframework/ios-arm64_armv7/MapboxMobileEvents.framework/MapboxMobileEvents -o Pods/MapboxMobileEvents/MapboxMobileEvents.xcframework/ios-arm64_armv7/MapboxMobileEvents.framework/MapboxMobileEvents` + end + + if target.name == 'MapboxCommon' + `xcrun -sdk iphoneos bitcode_strip -r Pods/MapboxCommon/MapboxCommon.xcframework/ios-arm64/MapboxCommon.framework/MapboxCommon -o Pods/MapboxCommon/MapboxCommon.xcframework/ios-arm64/MapboxCommon.framework/MapboxCommon` + end + + if target.name == 'MapboxCoreMaps' + `xcrun -sdk iphoneos bitcode_strip -r Pods/MapboxCoreMaps/MapboxCoreMaps.xcframework/ios-arm64/MapboxCoreMaps.framework/MapboxCoreMaps -o Pods/MapboxCoreMaps/MapboxCoreMaps.xcframework/ios-arm64/MapboxCoreMaps.framework/MapboxCoreMaps` + end end end end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ebaa3e1a..5dad833f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -318,7 +318,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -578,6 +578,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -728,6 +729,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -770,6 +772,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fab8f735..b2d2f7e5 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ generateURL(num amount, String orderDesc, String transactionID, String projId, String emailId, String paymentMethod, dynamic patientType, String patientName, dynamic patientID, @@ -489,7 +489,7 @@ class MyChromeSafariBrowser extends ChromeSafariBrowser { } @override - void onCompletedInitialLoad() { + void onCompletedInitialLoad(bool? didLoadSuccessfully) { print("ChromeSafari browser initial load completed"); onLoadStartCallback!("ApplePay"); } diff --git a/pubspec.yaml b/pubspec.yaml index 151d3e8d..e98c0152 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -109,7 +109,7 @@ dependencies: manage_calendar_events: ^2.0.3 #InAppBrowser - flutter_inappwebview: ^5.8.0 + flutter_inappwebview: ^6.1.0+1 #Circular progress bar for reverse timer circular_countdown_timer: ^0.2.0 @@ -135,9 +135,9 @@ dependencies: google_maps_place_picker_mb: ^3.0.0 map_launcher: ^3.0.1 flutter_countdown_timer: ^4.1.0 + carousel_slider: ^5.0.0 #Dependencies for video call implementation native_device_orientation: ^1.0.0 - wakelock: ^0.6.2 after_layout: ^1.1.0 cached_network_image: ^3.3.0 flutter_tts: ^3.6.1 @@ -153,14 +153,14 @@ dependencies: badges: ^3.1.2 flutter_app_icon_badge: ^2.0.0 # dropdown_search: 5.0.6 - youtube_player_flutter: ^8.1.2 + youtube_player_flutter: ^9.1.0 # shimmer: ^3.0.0 - carousel_slider: ^4.0.0 +# carousel_slider: ^4.0.0 # flutter_staggered_grid_view: ^0.7.0 huawei_hmsavailability: ^6.11.0+301 huawei_location: ^6.11.0+301 - share_plus: ^6.3.4 + share_plus: ^10.0.2 # Marker Animation auto_size_text: ^3.0.0 equatable: ^2.0.3 @@ -170,12 +170,13 @@ dependencies: google_api_availability: ^5.0.0 open_filex: ^4.3.2 path_provider: ^2.0.8 - amazon_payfort: ^1.1.0 + amazon_payfort: ^1.1.3 logger: ^2.0.2+1 network_info_plus: any - flutter_zoom_videosdk: ^1.10.11 + flutter_zoom_videosdk: ^1.11.2 dart_jsonwebtoken: ^2.14.0 + win32: ^5.5.4 cloudflare_turnstile: ^2.0.1