From bcba335ef66233c02289e41b5b8b32241dd9ca4b Mon Sep 17 00:00:00 2001 From: Erdem Yerebasmaz Date: Mon, 23 Sep 2024 11:50:14 +0300 Subject: [PATCH 1/2] Fix iOS sqlite3 linking issue fixes #888 Co-Authored-By: Ross Savage <551697+dangeross@users.noreply.github.com> --- ios/Podfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ios/Podfile b/ios/Podfile index 6a3c1c05b..af74919e8 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -46,6 +46,15 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| + # Remove the -lsqlite3 linker flag + # https://github.com/CocoaPods/CocoaPods/issues/830 + # We already include our own sqlite3 implementation via a pod, + # so we don't want the system-provided one as well. + xcconfig_path = config.base_configuration_reference.real_path + xcconfig = File.read(xcconfig_path) + new_xcconfig = xcconfig.sub('-l"sqlite3"', '') + File.open(xcconfig_path, "w") { |file| file << new_xcconfig } + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target config.build_settings['SWIFT_VERSION'] = '5.0' config.build_settings['ENABLE_BITCODE'] = 'NO' From 8ea0d88765c97caee08c1feee121d1ffb4c66a10 Mon Sep 17 00:00:00 2001 From: Ross Savage Date: Mon, 30 Sep 2024 10:15:17 +0200 Subject: [PATCH 2/2] Update fix to the same as Misty --- ios/Podfile | 34 ++++++++++++++++++---------------- ios/Podfile.lock | 6 +++--- pubspec.lock | 10 +++++----- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index af74919e8..f3b983065 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -45,22 +45,13 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) - target.build_configurations.each do |config| - # Remove the -lsqlite3 linker flag - # https://github.com/CocoaPods/CocoaPods/issues/830 - # We already include our own sqlite3 implementation via a pod, - # so we don't want the system-provided one as well. - xcconfig_path = config.base_configuration_reference.real_path - xcconfig = File.read(xcconfig_path) - new_xcconfig = xcconfig.sub('-l"sqlite3"', '') - File.open(xcconfig_path, "w") { |file| file << new_xcconfig } - - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target - config.build_settings['SWIFT_VERSION'] = '5.0' - config.build_settings['ENABLE_BITCODE'] = 'NO' - config.build_settings['CODE_SIGNING_REQUIRED'] = "NO" - config.build_settings['CODE_SIGNING_ALLOWED'] = "NO" - end + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target + config.build_settings['SWIFT_VERSION'] = '5.0' + config.build_settings['ENABLE_BITCODE'] = 'NO' + config.build_settings['CODE_SIGNING_REQUIRED'] = "NO" + config.build_settings['CODE_SIGNING_ALLOWED'] = "NO" + end end installer.generated_projects.each do |project| @@ -68,4 +59,15 @@ post_install do |installer| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target end end + + # Remove the -lsqlite3 linker flag + # https://github.com/CocoaPods/CocoaPods/issues/830 + # We already include our own sqlite3 implementation via a pod, + # so we don't want the system-provided one as well. + installer.generated_aggregate_targets.each do |target| + target.xcconfigs.each do |name, config| + config.libraries.delete('sqlite3') + config.save_as(Pathname.new(target.xcconfig_relative_path(name))) + end + end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 793a110cb..0097775ea 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,7 @@ PODS: - app_group_directory (1.0.0): - Flutter - - breez_sdk (0.5.1-rc3): + - breez_sdk (0.5.1-rc6): - Flutter - clipboard_watcher (0.0.1): - Flutter @@ -300,7 +300,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_group_directory: 7bf9f8f9819ead554de29da7c25fb7a680d6a9a0 - breez_sdk: c27f6e5a5ffb918ab57cff57cad4dd00e611f159 + breez_sdk: df2a669c65f4a7ccba23cc8ceedbacab6f3cd9f0 clipboard_watcher: 86fb70421aca6f4944e0591a8292605da7784666 connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d @@ -350,6 +350,6 @@ SPEC CHECKSUMS: url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe XCGLogger: 399c5885210b4e2ad79d9f7a29b105d672ef724f -PODFILE CHECKSUM: 90aa10f06f49fb924f3a73fc0e8b32bc6a6677ad +PODFILE CHECKSUM: f5bed5e3663c4397d1883bac77f3ebe699a03678 COCOAPODS: 1.15.2 diff --git a/pubspec.lock b/pubspec.lock index 6cd24783c..aa0b5cc1c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -103,7 +103,7 @@ packages: path: "../breez-sdk/libs/sdk-flutter" relative: true source: path - version: "0.5.1-rc3" + version: "0.5.1-rc6" breez_translations: dependency: "direct main" description: @@ -1219,10 +1219,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.4" plugin_platform_interface: dependency: "direct main" description: @@ -1760,10 +1760,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.1" watcher: dependency: transitive description: