diff --git a/CHANGELOG.md b/CHANGELOG.md index a77e8b9..e960cd5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.10.3 +- Update iOS podspec to use xcconfig for shared objects + ## 3.10.2 - Update iOS podspec to avoid excluding the simulator SDK diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 67c9bdb..f5786cb 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -21,8 +21,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e - openpgp: 937a8b18f330c97bf3612d6ab4ad5ccd89268e29 + openpgp: de9f45382feeb822e8417184db988e111406f51d -PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 +PODFILE CHECKSUM: db4843b9a4ec570ab76e33e3a2d3f4ded0ab206b COCOAPODS: 1.16.2 diff --git a/ios/openpgp.podspec b/ios/openpgp.podspec index d8063f7..e6fd1c7 100755 --- a/ios/openpgp.podspec +++ b/ios/openpgp.podspec @@ -21,12 +21,14 @@ Pod::Spec.new do |s| s.platform = :ios, '12.0' s.vendored_frameworks = 'Openpgp.xcframework' # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported. - + s.xcconfig = { + 'OTHER_LDFLAGS[sdk=iphoneos*]' => "-force_load '#{framework_path}/ios-arm64/libopenpgp_bridge.a'", + 'OTHER_LDFLAGS[sdk=iphonesimulator*]' => "-force_load '#{framework_path}/ios-arm64_x86_64-simulator/libopenpgp_bridge.a'", + 'OTHER_LDFLAGS[sdk=maccatalyst*]' => "-force_load '#{framework_path}/ios-arm64_x86_64-maccatalyst/libopenpgp_bridge.a'" + } s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', - 'OTHER_LDFLAGS[sdk=iphoneos*]' => "-force_load #{framework_path}/ios-arm64/libopenpgp_bridge.a", - 'OTHER_LDFLAGS[sdk=iphonesimulator*]' => "-force_load #{framework_path}/ios-arm64_x86_64-simulator/libopenpgp_bridge.a", - 'OTHER_LDFLAGS[sdk=maccatalyst*]' => "-force_load #{framework_path}/ios-arm64_x86_64-maccatalyst/libopenpgp_bridge.a" + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', } s.swift_version = '5.0' diff --git a/pubspec.yaml b/pubspec.yaml index 175aaca..1a6f3d0 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: openpgp description: library for use OpenPGP with support for android and ios, macOS, linux, windows and web -version: 3.10.2 +version: 3.10.3 homepage: https://github.com/jerson/flutter-openpgp environment: