Skip to content

Commit 773aef4

Browse files
muzipiaomuzipiao
committed
--use-libraries
1 parent c74b857 commit 773aef4

File tree

5 files changed

+41
-32
lines changed

5 files changed

+41
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
set -o pipefail
3232
echo Check if the library described by the podspec can be built
33-
pod lib lint --allow-warnings --skip-tests
33+
pod lib lint --use-libraries --allow-warnings --skip-tests
3434
echo Build as frameworks
3535
xcodebuild build -project GMObjC.xcodeproj -scheme 'GMObjC' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
3636
echo Build the Demo apps

‎Examples/GMObjCDemo.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@
925925
CODE_SIGN_IDENTITY = "Apple Development";
926926
CODE_SIGN_STYLE = Automatic;
927927
CURRENT_PROJECT_VERSION = 1;
928-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
928+
DEVELOPMENT_TEAM = 4BX77JHQHH;
929929
ENABLE_USER_SCRIPT_SANDBOXING = NO;
930930
GENERATE_INFOPLIST_FILE = YES;
931931
INFOPLIST_FILE = "GMObjC iOS Demo/Info.plist";
@@ -939,7 +939,7 @@
939939
"@executable_path/Frameworks",
940940
);
941941
MARKETING_VERSION = 1.0;
942-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
942+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.iosdemo;
943943
PRODUCT_NAME = "$(TARGET_NAME)";
944944
PROVISIONING_PROFILE_SPECIFIER = "";
945945
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -957,7 +957,7 @@
957957
CODE_SIGN_IDENTITY = "Apple Development";
958958
CODE_SIGN_STYLE = Automatic;
959959
CURRENT_PROJECT_VERSION = 1;
960-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
960+
DEVELOPMENT_TEAM = 4BX77JHQHH;
961961
ENABLE_USER_SCRIPT_SANDBOXING = NO;
962962
GENERATE_INFOPLIST_FILE = YES;
963963
INFOPLIST_FILE = "GMObjC iOS Demo/Info.plist";
@@ -971,7 +971,7 @@
971971
"@executable_path/Frameworks",
972972
);
973973
MARKETING_VERSION = 1.0;
974-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
974+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.iosdemo;
975975
PRODUCT_NAME = "$(TARGET_NAME)";
976976
PROVISIONING_PROFILE_SPECIFIER = "";
977977
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -988,12 +988,12 @@
988988
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
989989
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
990990
CODE_SIGN_ENTITLEMENTS = "GMObjC Mac Demo/GMObjC_Mac_Demo.entitlements";
991-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
991+
CODE_SIGN_IDENTITY = "Apple Development";
992992
CODE_SIGN_STYLE = Automatic;
993993
COMBINE_HIDPI_IMAGES = YES;
994994
CURRENT_PROJECT_VERSION = 1;
995995
DEAD_CODE_STRIPPING = YES;
996-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
996+
DEVELOPMENT_TEAM = 4BX77JHQHH;
997997
ENABLE_HARDENED_RUNTIME = YES;
998998
ENABLE_USER_SCRIPT_SANDBOXING = NO;
999999
GENERATE_INFOPLIST_FILE = YES;
@@ -1005,8 +1005,9 @@
10051005
"@executable_path/../Frameworks",
10061006
);
10071007
MARKETING_VERSION = 1.0;
1008-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
1008+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.macdemo;
10091009
PRODUCT_NAME = "$(TARGET_NAME)";
1010+
PROVISIONING_PROFILE_SPECIFIER = "";
10101011
SDKROOT = macosx;
10111012
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10121013
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1024,12 +1025,12 @@
10241025
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10251026
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
10261027
CODE_SIGN_ENTITLEMENTS = "GMObjC Mac Demo/GMObjC_Mac_Demo.entitlements";
1027-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
1028+
CODE_SIGN_IDENTITY = "Apple Development";
10281029
CODE_SIGN_STYLE = Automatic;
10291030
COMBINE_HIDPI_IMAGES = YES;
10301031
CURRENT_PROJECT_VERSION = 1;
10311032
DEAD_CODE_STRIPPING = YES;
1032-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
1033+
DEVELOPMENT_TEAM = 4BX77JHQHH;
10331034
ENABLE_HARDENED_RUNTIME = YES;
10341035
ENABLE_USER_SCRIPT_SANDBOXING = NO;
10351036
GENERATE_INFOPLIST_FILE = YES;
@@ -1041,8 +1042,9 @@
10411042
"@executable_path/../Frameworks",
10421043
);
10431044
MARKETING_VERSION = 1.0;
1044-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
1045+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.macdemo;
10451046
PRODUCT_NAME = "$(TARGET_NAME)";
1047+
PROVISIONING_PROFILE_SPECIFIER = "";
10461048
SDKROOT = macosx;
10471049
SWIFT_COMPILATION_MODE = wholemodule;
10481050
SWIFT_EMIT_LOC_STRINGS = YES;

‎GMObjC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Tests/GMObjCTests.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@
785785
COPY_PHASE_STRIP = NO;
786786
CURRENT_PROJECT_VERSION = 1;
787787
DEBUG_INFORMATION_FORMAT = dwarf;
788-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
788+
DEVELOPMENT_TEAM = 4BX77JHQHH;
789789
ENABLE_STRICT_OBJC_MSGSEND = YES;
790790
ENABLE_TESTABILITY = YES;
791791
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -812,7 +812,7 @@
812812
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
813813
MTL_FAST_MATH = YES;
814814
ONLY_ACTIVE_ARCH = YES;
815-
PRODUCT_BUNDLE_IDENTIFIER = "com.lifei.Tests-iOS";
815+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.testsios;
816816
PRODUCT_NAME = "$(TARGET_NAME)";
817817
SDKROOT = iphoneos;
818818
SWIFT_EMIT_LOC_STRINGS = NO;
@@ -859,7 +859,7 @@
859859
COPY_PHASE_STRIP = NO;
860860
CURRENT_PROJECT_VERSION = 1;
861861
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
862-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
862+
DEVELOPMENT_TEAM = 4BX77JHQHH;
863863
ENABLE_NS_ASSERTIONS = NO;
864864
ENABLE_STRICT_OBJC_MSGSEND = YES;
865865
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -879,7 +879,7 @@
879879
MARKETING_VERSION = 1.0;
880880
MTL_ENABLE_DEBUG_INFO = NO;
881881
MTL_FAST_MATH = YES;
882-
PRODUCT_BUNDLE_IDENTIFIER = "com.lifei.Tests-iOS";
882+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.testsios;
883883
PRODUCT_NAME = "$(TARGET_NAME)";
884884
SDKROOT = iphoneos;
885885
SWIFT_EMIT_LOC_STRINGS = NO;
@@ -929,7 +929,7 @@
929929
COPY_PHASE_STRIP = NO;
930930
CURRENT_PROJECT_VERSION = 1;
931931
DEBUG_INFORMATION_FORMAT = dwarf;
932-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
932+
DEVELOPMENT_TEAM = 4BX77JHQHH;
933933
ENABLE_STRICT_OBJC_MSGSEND = YES;
934934
ENABLE_TESTABILITY = YES;
935935
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -960,7 +960,7 @@
960960
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
961961
MTL_FAST_MATH = YES;
962962
ONLY_ACTIVE_ARCH = YES;
963-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
963+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.testhost;
964964
PRODUCT_NAME = "$(TARGET_NAME)";
965965
PROVISIONING_PROFILE_SPECIFIER = "";
966966
SDKROOT = iphoneos;
@@ -1010,7 +1010,7 @@
10101010
COPY_PHASE_STRIP = NO;
10111011
CURRENT_PROJECT_VERSION = 1;
10121012
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1013-
DEVELOPMENT_TEAM = 9CA5KUE8T7;
1013+
DEVELOPMENT_TEAM = 4BX77JHQHH;
10141014
ENABLE_NS_ASSERTIONS = NO;
10151015
ENABLE_STRICT_OBJC_MSGSEND = YES;
10161016
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1034,7 +1034,7 @@
10341034
MARKETING_VERSION = 1.0;
10351035
MTL_ENABLE_DEBUG_INFO = NO;
10361036
MTL_FAST_MATH = YES;
1037-
PRODUCT_BUNDLE_IDENTIFIER = com.jinher.jingquezhili;
1037+
PRODUCT_BUNDLE_IDENTIFIER = com.lifei.gmobjc.testhost;
10381038
PRODUCT_NAME = "$(TARGET_NAME)";
10391039
PROVISIONING_PROFILE_SPECIFIER = "";
10401040
SDKROOT = iphoneos;

‎Tests/Tests iOS/GMSm2v1Tests.m‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,7 @@ - (void)testASN1SameResult {
428428
NSString *ciphertHex = [GMSm2Utils encryptText:plaintext publicKey:self.gPubKey];
429429
XCTAssertTrue(ciphertHex.length > 0, @"加密字符串不为空");
430430

431-
NSData *plainData = [plaintext dataUsingEncoding:NSUTF8StringEncoding];
432-
NSData *ciphertData = [GMSm2Utils encryptData:plainData publicKey:self.gPubKey];
431+
NSData *ciphertData = [GMSmUtils dataFromHexString:ciphertHex];
433432
XCTAssertNotNil(ciphertData, @"加密字符串不为空");
434433

435434
NSData *c1c3c2Data = [GMSm2Utils asn1DecodeToC1C3C2Data:ciphertData hasPrefix:NO];
@@ -444,21 +443,21 @@ - (void)testASN1SameResult {
444443
NSData *c1c3c2HexToData = [GMSmUtils dataFromHexString:c1c3c2Hex];
445444
XCTAssertTrue([c1c3c2HexToData isEqualToData:c1c3c2Data], @"不同API解码结果应该相同");
446445

447-
NSData *encodeStr = [GMSm2Utils asn1EncodeWithC1C3C2Data:c1c3c2Data hasPrefix:NO];
448-
XCTAssertNotNil(encodeStr, @"ASN1编码后字符串不为空");
446+
NSData *encodeData = [GMSm2Utils asn1EncodeWithC1C3C2Data:c1c3c2Data hasPrefix:NO];
447+
XCTAssertNotNil(encodeData, @"ASN1编码后字符串不为空");
449448
for (NSInteger i = 0; i < 1000; i++) {
450-
NSData *newEncodeStr = [GMSm2Utils asn1EncodeWithC1C3C2Data:c1c3c2Data hasPrefix:NO];
451-
BOOL isSame_encode = [newEncodeStr isEqualToData:encodeStr];
452-
XCTAssertTrue(isSame_encode, @"多次编码应该相同");
449+
NSData *newEncodeData = [GMSm2Utils asn1EncodeWithC1C3C2Data:c1c3c2Data hasPrefix:NO];
450+
BOOL isSameEncode = [newEncodeData isEqualToData:encodeData];
451+
XCTAssertTrue(isSameEncode, @"多次编码应该相同");
453452
}
454453

455-
BOOL isSame_Ctext = [encodeStr isEqualToData:ciphertData];
456-
XCTAssertTrue(isSame_Ctext, @"编码后和原始密文相同");
454+
BOOL isSameCiphertext = [encodeData isEqualToData:ciphertData];
455+
XCTAssertTrue(isSameCiphertext, @"编码后和原始密文相同");
457456

458-
NSData *decryptStr = [GMSm2Utils decryptData:ciphertData privateKey:self.gPriKey];
459-
XCTAssertNotNil(decryptStr, @"解密结果不为空");
460-
BOOL isSame_plain = [decryptStr isEqualToData:plainData];
461-
XCTAssertTrue(isSame_plain, @"加解密结果应该相同");
457+
NSData *decryptData = [GMSm2Utils decryptData:ciphertData privateKey:self.gPriKey];
458+
XCTAssertNotNil(decryptData, @"解密结果不为空");
459+
BOOL isSamePlaintext = [decryptData isEqualToData:[plaintext dataUsingEncoding:NSUTF8StringEncoding]];
460+
XCTAssertTrue(isSamePlaintext, @"加解密结果应该相同");
462461
}
463462

464463
- (void)testASN1AnyText {

0 commit comments

Comments
 (0)