Skip to content

Commit b5f389f

Browse files
committed
fix: Xcode15.3 archive failed alibaba#491
1 parent f0b15db commit b5f389f

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

HandyJSON.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@
13231323
ENABLE_BITCODE = NO;
13241324
INFOPLIST_FILE = "$(SRCROOT)/Source/Info-iOS.plist";
13251325
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1326-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1326+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
13271327
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13281328
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSON;
13291329
PRODUCT_NAME = "$(PROJECT_NAME)";
@@ -1347,7 +1347,7 @@
13471347
ENABLE_BITCODE = NO;
13481348
INFOPLIST_FILE = "$(SRCROOT)/Source/Info-iOS.plist";
13491349
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1350-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1350+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
13511351
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13521352
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSON;
13531353
PRODUCT_NAME = "$(PROJECT_NAME)";
@@ -1366,7 +1366,7 @@
13661366
DEVELOPMENT_TEAM = QBMN2BBW3K;
13671367
ENABLE_BITCODE = NO;
13681368
INFOPLIST_FILE = HandyJSONDemo/Info.plist;
1369-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1369+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
13701370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13711371
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONDemo;
13721372
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1386,7 +1386,7 @@
13861386
DEVELOPMENT_TEAM = QBMN2BBW3K;
13871387
ENABLE_BITCODE = NO;
13881388
INFOPLIST_FILE = HandyJSONDemo/Info.plist;
1389-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1389+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
13901390
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13911391
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONDemo;
13921392
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1402,7 +1402,7 @@
14021402
BUNDLE_LOADER = "$(TEST_HOST)";
14031403
DEVELOPMENT_TEAM = "";
14041404
INFOPLIST_FILE = "Tests/HandyJSONTests/Info-iOS.plist";
1405-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1405+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
14061406
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14071407
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONTests;
14081408
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1417,7 +1417,7 @@
14171417
BUNDLE_LOADER = "$(TEST_HOST)";
14181418
DEVELOPMENT_TEAM = "";
14191419
INFOPLIST_FILE = "Tests/HandyJSONTests/Info-iOS.plist";
1420-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1420+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
14211421
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14221422
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONTests;
14231423
PRODUCT_NAME = "$(TARGET_NAME)";

Source/Metadata.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,14 @@ extension Metadata {
290290
var name: String?
291291
var type: Any.Type?
292292
}
293-
for i in 0..<self.numberOfFields {
293+
for i in 0..<self.numberOfFields where fieldRecords[i].mangledTypeName != nil{
294294
let name = fieldRecords[i].fieldName
295-
if let cMangledTypeName = fieldRecords[i].mangledTypeName,
296-
let fieldType = _getTypeByMangledNameInContext(cMangledTypeName, getMangledTypeNameSize(cMangledTypeName), genericContext: self.contextDescriptorPointer, genericArguments: self.genericArgumentVector) {
297-
295+
let cMangledTypeName = fieldRecords[i].mangledTypeName!
296+
297+
let functionMap: [String: () -> Any.Type?] = [
298+
"function": { _getTypeByMangledNameInContext(cMangledTypeName, UInt(getMangledTypeNameSize(cMangledTypeName)), genericContext: self.contextDescriptorPointer, genericArguments: self.genericArgumentVector) }
299+
]
300+
if let function = functionMap["function"],let fieldType = function() {
298301
result.append(Property.Description(key: name, type: fieldType, offset: fieldOffsets[i]))
299302
}
300303
}

0 commit comments

Comments
 (0)