Skip to content

Commit 2d37600

Browse files
muzipiaomuzipiao
committed
替换动态库 OpenSSL.xcframework 为静态库
1 parent 66b2ada commit 2d37600

File tree

48 files changed

+1261
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1261
-176
lines changed

‎Examples/GMObjCDemo.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@
306306
9C7458EC270FE3AD0062C1E5 /* Sources */,
307307
9C7458ED270FE3AD0062C1E5 /* Frameworks */,
308308
9C7458EE270FE3AD0062C1E5 /* Resources */,
309-
6C7043D4C755593EC5704090 /* [CP] Embed Pods Frameworks */,
310309
1D63A4899B8BDB75E8F646B9 /* [CP] Copy Pods Resources */,
311310
);
312311
buildRules = (
@@ -453,23 +452,6 @@
453452
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
454453
showEnvVarsInLog = 0;
455454
};
456-
6C7043D4C755593EC5704090 /* [CP] Embed Pods Frameworks */ = {
457-
isa = PBXShellScriptBuildPhase;
458-
buildActionMask = 2147483647;
459-
files = (
460-
);
461-
inputFileListPaths = (
462-
"${PODS_ROOT}/Target Support Files/Pods-GMObjC iOS Demo/Pods-GMObjC iOS Demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
463-
);
464-
name = "[CP] Embed Pods Frameworks";
465-
outputFileListPaths = (
466-
"${PODS_ROOT}/Target Support Files/Pods-GMObjC iOS Demo/Pods-GMObjC iOS Demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
467-
);
468-
runOnlyForDeploymentPostprocessing = 0;
469-
shellPath = /bin/sh;
470-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GMObjC iOS Demo/Pods-GMObjC iOS Demo-frameworks.sh\"\n";
471-
showEnvVarsInLog = 0;
472-
};
473455
/* End PBXShellScriptBuildPhase section */
474456

475457
/* Begin PBXSourcesBuildPhase section */

‎GMObjC.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "GMObjC"
3-
s.version = "3.3.7"
3+
s.version = "3.3.8"
44
s.summary = "国密 SM2、SM3、SM4 的 OC 封装，基于 OpenSSL。"
55
s.description = '基于 OpenSSL 封装 SM2、SM4 加解密、SM3 摘要算法、SM2 签名验签、ECDH 密钥协商、' \
66
'ASN1 编码解码、DER 编码解码，HMAC 算法等。'

‎GMObjC/GMObjC.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#import <Foundation/Foundation.h>
1212

13-
#define GMOBJC_VERSION_NUMBER 0x303020
14-
#define GMOBJC_VERSION_TEXT "GMObjC 3.3.2 02 Dec 2021"
13+
#define GMOBJC_VERSION_NUMBER 0x303080
14+
#define GMOBJC_VERSION_TEXT "GMObjC 3.3.8 06 Nov 2024"
1515

1616
#import "GMUtils.h"
1717
#import "GMObjCDef.h"

‎README-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GMObjC 从 3.3.0 开始支持 SwiftPM，在工程中使用，点击 `File` -> `S
8585

8686
```swift
8787
dependencies: [
88-
.package(url: "https://github.com/muzipiao/GMObjC.git", from: "3.3.7")
88+
.package(url: "https://github.com/muzipiao/GMObjC.git", from: "3.3.8")
8989
],
9090
```
9191

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ If you're a framework author and use GMObjC as a dependency, update your `Packag
8787

8888
```swift
8989
dependencies: [
90-
.package(url: "https://github.com/muzipiao/GMObjC.git", from: "3.3.7")
90+
.package(url: "https://github.com/muzipiao/GMObjC.git", from: "3.3.8")
9191
],
9292
```
9393

‎Tests/GMObjCTests.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@
365365
9C7219FB271008A100B86975 /* Sources */,
366366
9C7219FC271008A100B86975 /* Frameworks */,
367367
9C7219FD271008A100B86975 /* Resources */,
368-
80FFC18FCC58378F9D848717 /* [CP] Embed Pods Frameworks */,
369368
18B5213EC07771050D1C7BFE /* [CP] Copy Pods Resources */,
370369
);
371370
buildRules = (
@@ -386,7 +385,6 @@
386385
9CC6BE8427118B11004C47EE /* Sources */,
387386
9CC6BE8527118B11004C47EE /* Frameworks */,
388387
9CC6BE8627118B11004C47EE /* Resources */,
389-
C5B5CF9F04F131F3EF384E28 /* [CP] Embed Pods Frameworks */,
390388
7E800F1AF545CDEA24EEF43E /* [CP] Copy Pods Resources */,
391389
);
392390
buildRules = (
@@ -562,40 +560,6 @@
562560
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests Host/Pods-Tests Host-resources.sh\"\n";
563561
showEnvVarsInLog = 0;
564562
};
565-
80FFC18FCC58378F9D848717 /* [CP] Embed Pods Frameworks */ = {
566-
isa = PBXShellScriptBuildPhase;
567-
buildActionMask = 2147483647;
568-
files = (
569-
);
570-
inputFileListPaths = (
571-
"${PODS_ROOT}/Target Support Files/Pods-Tests iOS/Pods-Tests iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
572-
);
573-
name = "[CP] Embed Pods Frameworks";
574-
outputFileListPaths = (
575-
"${PODS_ROOT}/Target Support Files/Pods-Tests iOS/Pods-Tests iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
576-
);
577-
runOnlyForDeploymentPostprocessing = 0;
578-
shellPath = /bin/sh;
579-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests iOS/Pods-Tests iOS-frameworks.sh\"\n";
580-
showEnvVarsInLog = 0;
581-
};
582-
C5B5CF9F04F131F3EF384E28 /* [CP] Embed Pods Frameworks */ = {
583-
isa = PBXShellScriptBuildPhase;
584-
buildActionMask = 2147483647;
585-
files = (
586-
);
587-
inputFileListPaths = (
588-
"${PODS_ROOT}/Target Support Files/Pods-Tests Host/Pods-Tests Host-frameworks-${CONFIGURATION}-input-files.xcfilelist",
589-
);
590-
name = "[CP] Embed Pods Frameworks";
591-
outputFileListPaths = (
592-
"${PODS_ROOT}/Target Support Files/Pods-Tests Host/Pods-Tests Host-frameworks-${CONFIGURATION}-output-files.xcfilelist",
593-
);
594-
runOnlyForDeploymentPostprocessing = 0;
595-
shellPath = /bin/sh;
596-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests Host/Pods-Tests Host-frameworks.sh\"\n";
597-
showEnvVarsInLog = 0;
598-
};
599563
D4833740E6E37C452CFEB4AE /* [CP] Check Pods Manifest.lock */ = {
600564
isa = PBXShellScriptBuildPhase;
601565
buildActionMask = 2147483647;

‎XCFrameworks/OpenSSL.xcframework/Info.plist‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>OpenSSL.framework/OpenSSL</string>
9+
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64_x86_64-simulator</string>
11+
<string>macos-arm64_x86_64</string>
1212
<key>LibraryPath</key>
1313
<string>OpenSSL.framework</string>
1414
<key>SupportedArchitectures</key>
@@ -17,46 +17,44 @@
1717
<string>x86_64</string>
1818
</array>
1919
<key>SupportedPlatform</key>
20-
<string>ios</string>
21-
<key>SupportedPlatformVariant</key>
22-
<string>simulator</string>
20+
<string>macos</string>
2321
</dict>
2422
<dict>
2523
<key>BinaryPath</key>
26-
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
24+
<string>OpenSSL.framework/OpenSSL</string>
2725
<key>LibraryIdentifier</key>
28-
<string>ios-arm64_x86_64-maccatalyst</string>
26+
<string>ios-arm64</string>
2927
<key>LibraryPath</key>
3028
<string>OpenSSL.framework</string>
3129
<key>SupportedArchitectures</key>
3230
<array>
3331
<string>arm64</string>
34-
<string>x86_64</string>
3532
</array>
3633
<key>SupportedPlatform</key>
3734
<string>ios</string>
38-
<key>SupportedPlatformVariant</key>
39-
<string>maccatalyst</string>
4035
</dict>
4136
<dict>
4237
<key>BinaryPath</key>
4338
<string>OpenSSL.framework/OpenSSL</string>
4439
<key>LibraryIdentifier</key>
45-
<string>ios-arm64</string>
40+
<string>ios-arm64_x86_64-simulator</string>
4641
<key>LibraryPath</key>
4742
<string>OpenSSL.framework</string>
4843
<key>SupportedArchitectures</key>
4944
<array>
5045
<string>arm64</string>
46+
<string>x86_64</string>
5147
</array>
5248
<key>SupportedPlatform</key>
5349
<string>ios</string>
50+
<key>SupportedPlatformVariant</key>
51+
<string>simulator</string>
5452
</dict>
5553
<dict>
5654
<key>BinaryPath</key>
5755
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
5856
<key>LibraryIdentifier</key>
59-
<string>macos-arm64_x86_64</string>
57+
<string>ios-arm64_x86_64-maccatalyst</string>
6058
<key>LibraryPath</key>
6159
<string>OpenSSL.framework</string>
6260
<key>SupportedArchitectures</key>
@@ -65,7 +63,9 @@
6563
<string>x86_64</string>
6664
</array>
6765
<key>SupportedPlatform</key>
68-
<string>macos</string>
66+
<string>ios</string>
67+
<key>SupportedPlatformVariant</key>
68+
<string>maccatalyst</string>
6969
</dict>
7070
</array>
7171
<key>CFBundlePackageType</key>

‎XCFrameworks/OpenSSL.xcframework/_CodeSignature/CodeDirectory‎

0 Bytes
Binary file not shown.

‎XCFrameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements‎

-12 Bytes
Binary file not shown.

‎XCFrameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements-1‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)