Skip to content

Commit ff311f5

Browse files
jersonjerson
committed
Update iOS podspec and xcframework to avoid force load
1 parent 1e66c16 commit ff311f5

File tree

25 files changed

+98
-34
lines changed

25 files changed

+98
-34
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 3.10.4
2+
- Update iOS podspec and xcframework to avoid force load
3+
14
## 3.10.3
25
- Update iOS podspec to use xcconfig for shared objects
36

‎android/src/main/jniLibs/arm64-v8a/libopenpgp_bridge.so

256 Bytes
Binary file not shown.

‎android/src/main/jniLibs/armeabi-v7a/libopenpgp_bridge.so

320 Bytes
Binary file not shown.

‎android/src/main/jniLibs/x86/libopenpgp_bridge.so

352 Bytes
Binary file not shown.

‎android/src/main/jniLibs/x86_64/libopenpgp_bridge.so

256 Bytes
Binary file not shown.

‎example/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PODS:
22
- Flutter (1.0.0)
33
- integration_test (0.0.1):
44
- Flutter
5-
- openpgp (0.6.0):
5+
- openpgp (0.7.0):
66
- Flutter
77

88
DEPENDENCIES:
@@ -21,8 +21,8 @@ EXTERNAL SOURCES:
2121
SPEC CHECKSUMS:
2222
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
2323
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
24-
openpgp: de9f45382feeb822e8417184db988e111406f51d
24+
openpgp: 3dc5989c69b89a28b642b343dada348c8ed79ef1
2525

26-
PODFILE CHECKSUM: db4843b9a4ec570ab76e33e3a2d3f4ded0ab206b
26+
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
2727

2828
COCOAPODS: 1.16.2

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
97C146EC1CF9000F007C117D /* Resources */,
199199
9705A1C41CF9048500538489 /* Embed Frameworks */,
200200
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
201-
6664A8B132362F3E30904596 /* [CP] Embed Pods Frameworks */,
201+
6509730B10C292203E0920A2 /* [CP] Embed Pods Frameworks */,
202202
);
203203
buildRules = (
204204
);
@@ -286,7 +286,7 @@
286286
shellPath = /bin/sh;
287287
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
288288
};
289-
6664A8B132362F3E30904596 /* [CP] Embed Pods Frameworks */ = {
289+
6509730B10C292203E0920A2 /* [CP] Embed Pods Frameworks */ = {
290290
isa = PBXShellScriptBuildPhase;
291291
buildActionMask = 2147483647;
292292
files = (

‎ios/Classes/OpenpgpPlugin.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Flutter
22
import UIKit
3+
import OpenPGPBridge
34

45
public class OpenpgpPlugin: NSObject, FlutterPlugin {
56
public static func register(with registrar: FlutterPluginRegistrar) {
@@ -12,6 +13,9 @@ public class OpenpgpPlugin: NSObject, FlutterPlugin {
1213
switch call.method {
1314
case "getPlatformVersion":
1415
result("iOS " + UIDevice.current.systemVersion)
16+
case "init":
17+
_ = OpenPGPBridge.OpenPGPEncodeText(nil, nil)
18+
result("success")
1519
default:
1620
result(FlutterMethodNotImplemented)
1721
}

‎ios/Openpgp.xcframework/Info.plist renamed to ‎ios/OpenPGPBridge.xcframework/Info.plist

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>libopenpgp_bridge.a</string>
10-
<key>HeadersPath</key>
11-
<string>Headers</string>
9+
<string>OpenPGPBridge.framework/OpenPGPBridge</string>
1210
<key>LibraryIdentifier</key>
1311
<string>ios-arm64_x86_64-maccatalyst</string>
1412
<key>LibraryPath</key>
15-
<string>libopenpgp_bridge.a</string>
13+
<string>OpenPGPBridge.framework</string>
1614
<key>SupportedArchitectures</key>
1715
<array>
1816
<string>arm64</string>
@@ -25,38 +23,34 @@
2523
</dict>
2624
<dict>
2725
<key>BinaryPath</key>
28-
<string>libopenpgp_bridge.a</string>
29-
<key>HeadersPath</key>
30-
<string>Headers</string>
26+
<string>OpenPGPBridge.framework/OpenPGPBridge</string>
3127
<key>LibraryIdentifier</key>
32-
<string>ios-arm64</string>
28+
<string>ios-arm64_x86_64-simulator</string>
3329
<key>LibraryPath</key>
34-
<string>libopenpgp_bridge.a</string>
30+
<string>OpenPGPBridge.framework</string>
3531
<key>SupportedArchitectures</key>
3632
<array>
3733
<string>arm64</string>
34+
<string>x86_64</string>
3835
</array>
3936
<key>SupportedPlatform</key>
4037
<string>ios</string>
38+
<key>SupportedPlatformVariant</key>
39+
<string>simulator</string>
4140
</dict>
4241
<dict>
4342
<key>BinaryPath</key>
44-
<string>libopenpgp_bridge.a</string>
45-
<key>HeadersPath</key>
46-
<string>Headers</string>
43+
<string>OpenPGPBridge.framework/OpenPGPBridge</string>
4744
<key>LibraryIdentifier</key>
48-
<string>ios-arm64_x86_64-simulator</string>
45+
<string>ios-arm64</string>
4946
<key>LibraryPath</key>
50-
<string>libopenpgp_bridge.a</string>
47+
<string>OpenPGPBridge.framework</string>
5148
<key>SupportedArchitectures</key>
5249
<array>
5350
<string>arm64</string>
54-
<string>x86_64</string>
5551
</array>
5652
<key>SupportedPlatform</key>
5753
<string>ios</string>
58-
<key>SupportedPlatformVariant</key>
59-
<string>simulator</string>
6054
</dict>
6155
</array>
6256
<key>CFBundlePackageType</key>

‎ios/Openpgp.xcframework/ios-arm64/Headers/libopenpgp_bridge.h renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64/OpenPGPBridge.framework/Headers/libopenpgp_bridge.h

File renamed without changes.

‎ios/OpenPGPBridge.xcframework/ios-arm64/OpenPGPBridge.framework/Info.plist

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleExecutable</key>
6+
<string>OpenPGPBridge</string>
7+
<key>CFBundleIdentifier</key>
8+
<string>OpenPGPBridge</string>
9+
<key>MinimumOSVersion</key>
10+
<string>100.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>1.13.0</string>
13+
<key>CFBundleVersion</key>
14+
<string>1.13.0.1745445221</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
</dict>
18+
</plist>

‎ios/OpenPGPBridge.xcframework/ios-arm64/OpenPGPBridge.framework/Modules/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework module "OpenPGPBridge" {
2+
header "libopenpgp_bridge.h"
3+
export *
4+
}

‎ios/Openpgp.xcframework/ios-arm64/libopenpgp_bridge.a renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64/OpenPGPBridge.framework/OpenPGPBridge

5.2 MB
Binary file not shown.

‎ios/Openpgp.xcframework/ios-arm64_x86_64-maccatalyst/Headers/libopenpgp_bridge.h renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-maccatalyst/OpenPGPBridge.framework/Headers/libopenpgp_bridge.h

File renamed without changes.

‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-maccatalyst/OpenPGPBridge.framework/Info.plist

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleExecutable</key>
6+
<string>OpenPGPBridge</string>
7+
<key>CFBundleIdentifier</key>
8+
<string>OpenPGPBridge</string>
9+
<key>MinimumOSVersion</key>
10+
<string>100.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>1.13.0</string>
13+
<key>CFBundleVersion</key>
14+
<string>1.13.0.1745445221</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
</dict>
18+
</plist>

‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-maccatalyst/OpenPGPBridge.framework/Modules/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework module "OpenPGPBridge" {
2+
header "libopenpgp_bridge.h"
3+
export *
4+
}

‎ios/Openpgp.xcframework/ios-arm64_x86_64-maccatalyst/libopenpgp_bridge.a renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-maccatalyst/OpenPGPBridge.framework/OpenPGPBridge

10.2 MB
Binary file not shown.

‎ios/Openpgp.xcframework/ios-arm64_x86_64-simulator/Headers/libopenpgp_bridge.h renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-simulator/OpenPGPBridge.framework/Headers/libopenpgp_bridge.h

File renamed without changes.

‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-simulator/OpenPGPBridge.framework/Info.plist

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleExecutable</key>
6+
<string>OpenPGPBridge</string>
7+
<key>CFBundleIdentifier</key>
8+
<string>OpenPGPBridge</string>
9+
<key>MinimumOSVersion</key>
10+
<string>100.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>1.13.0</string>
13+
<key>CFBundleVersion</key>
14+
<string>1.13.0.1745445221</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
</dict>
18+
</plist>

‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-simulator/OpenPGPBridge.framework/Modules/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework module "OpenPGPBridge" {
2+
header "libopenpgp_bridge.h"
3+
export *
4+
}

‎ios/Openpgp.xcframework/ios-arm64_x86_64-simulator/libopenpgp_bridge.a renamed to ‎ios/OpenPGPBridge.xcframework/ios-arm64_x86_64-simulator/OpenPGPBridge.framework/OpenPGPBridge

10.3 MB
Binary file not shown.

‎ios/openpgp.podspec

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
33
# Run `pod lib lint openpgp.podspec' to validate before publishing.
44
#
5-
framework_path = File.join(__dir__, "Openpgp.xcframework").gsub(/ /, '\ ')
65

76
Pod::Spec.new do |s|
87
s.name = 'openpgp'
9-
s.version = '0.6.0'
8+
s.version = '0.7.0'
109
s.summary = 'library for use openPGP.'
1110
s.description = <<-DESC
1211
library for use openPGP.
@@ -19,17 +18,15 @@ Pod::Spec.new do |s|
1918

2019
s.dependency 'Flutter'
2120
s.platform = :ios, '12.0'
22-
s.vendored_frameworks = 'Openpgp.xcframework'
21+
22+
s.vendored_frameworks = 'OpenPGPBridge.xcframework'
23+
s.static_framework = true
2324
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
24-
s.xcconfig = {
25-
'OTHER_LDFLAGS[sdk=iphoneos*]' => "-force_load '#{framework_path}/ios-arm64/libopenpgp_bridge.a'",
26-
'OTHER_LDFLAGS[sdk=iphonesimulator*]' => "-force_load '#{framework_path}/ios-arm64_x86_64-simulator/libopenpgp_bridge.a'",
27-
'OTHER_LDFLAGS[sdk=maccatalyst*]' => "-force_load '#{framework_path}/ios-arm64_x86_64-maccatalyst/libopenpgp_bridge.a'"
28-
}
29-
s.pod_target_xcconfig = {
30-
'DEFINES_MODULE' => 'YES',
31-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
25+
s.pod_target_xcconfig = {
26+
'DEFINES_MODULE' => 'YES',
27+
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386'
3228
}
29+
3330
s.swift_version = '5.0'
3431

3532
end

‎lib/web/assets/openpgp.wasm

-14 Bytes
Binary file not shown.

‎macos/libopenpgp_bridge.dylib

0 Bytes
Binary file not shown.

‎pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: openpgp
22
description: library for use OpenPGP with support for android and ios, macOS, linux, windows and web
3-
version: 3.10.3
3+
version: 3.10.4
44
homepage: https://github.com/jerson/flutter-openpgp
55

66
environment:

0 commit comments

Comments
 (0)