From 3a4a5dcc5b12942f17d3ae17e862222c74eb4ea0 Mon Sep 17 00:00:00 2001 From: heyifu <> Date: Fri, 5 Sep 2025 17:19:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=20=20'Protobuf',=20'~?= =?UTF-8?q?>=203.29.5'=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 4 +- Podfile.lock | 13 +-- SVGAPlayer.xcodeproj/project.pbxproj | 41 ++++++-- Source/pbobjc/Svga.pbobjc.m | 146 +++++++++++++++++++-------- 4 files changed, 146 insertions(+), 58 deletions(-) diff --git a/Podfile b/Podfile index 3cb9a7ae..1cab8748 100644 --- a/Podfile +++ b/Podfile @@ -1,8 +1,8 @@ -platform :ios, '8.0' +platform :ios, '13.0' target 'SVGAPlayer' do pod 'SSZipArchive', '~> 2.1.4' - pod 'Protobuf', '~> 3.4' + pod 'Protobuf', '~> 3.29.5' end diff --git a/Podfile.lock b/Podfile.lock index be536f16..3bba9afa 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,20 +1,21 @@ PODS: - - Protobuf (3.6.1) + - Protobuf (3.29.5) - SSZipArchive (2.1.4) DEPENDENCIES: - - Protobuf (~> 3.4) + - Protobuf (~> 3.29.5) - SSZipArchive (~> 2.1.4) SPEC REPOS: https://github.com/CocoaPods/Specs.git: - - Protobuf - SSZipArchive + trunk: + - Protobuf SPEC CHECKSUMS: - Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5 + Protobuf: 164aea2ae380c3951abdc3e195220c01d17400e0 SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322 -PODFILE CHECKSUM: 15ec3c806396baa34a298b2254638f0a6691580c +PODFILE CHECKSUM: 933aa607b280b85725d0b34be3e446c08f1cb28f -COCOAPODS: 1.9.1 +COCOAPODS: 1.16.2 diff --git a/SVGAPlayer.xcodeproj/project.pbxproj b/SVGAPlayer.xcodeproj/project.pbxproj index 4f39f57f..855e1ce4 100644 --- a/SVGAPlayer.xcodeproj/project.pbxproj +++ b/SVGAPlayer.xcodeproj/project.pbxproj @@ -247,6 +247,7 @@ 90A676D91D13A6DF008A69F3 /* Sources */, 90A676DA1D13A6DF008A69F3 /* Frameworks */, 90A676DB1D13A6DF008A69F3 /* Resources */, + 493A63906EFBD274E089055B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -268,7 +269,7 @@ TargetAttributes = { 90A676DC1D13A6DF008A69F3 = { CreatedOnToolsVersion = 7.3; - DevelopmentTeam = S2RM275849; + DevelopmentTeam = FZ3FZ4G956; }; }; }; @@ -315,6 +316,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 493A63906EFBD274E089055B /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SVGAPlayer/Pods-SVGAPlayer-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/Protobuf/Protobuf_Privacy.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protobuf_Privacy.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SVGAPlayer/Pods-SVGAPlayer-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; CD70B01EE331E392E355CD26 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -471,13 +490,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = S2RM275849; + DEVELOPMENT_TEAM = FZ3FZ4G956; INFOPLIST_FILE = SVGAPlayer/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.opensource.SVGAPlayer; + PRODUCT_BUNDLE_IDENTIFIER = com.opensource.SVGAPlayerheyifu; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -488,13 +511,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = S2RM275849; + DEVELOPMENT_TEAM = FZ3FZ4G956; INFOPLIST_FILE = SVGAPlayer/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.opensource.SVGAPlayer; + PRODUCT_BUNDLE_IDENTIFIER = com.opensource.SVGAPlayerheyifu; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Source/pbobjc/Svga.pbobjc.m b/Source/pbobjc/Svga.pbobjc.m index 3fd8e4d7..28876653 100644 --- a/Source/pbobjc/Svga.pbobjc.m +++ b/Source/pbobjc/Svga.pbobjc.m @@ -585,27 +585,46 @@ void SVGAProtoShapeEntity_ClearArgsOneOfCase(SVGAProtoShapeEntity *message) { } #pragma mark - Enum SVGAProtoShapeEntity_ShapeType +//GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeType_EnumDescriptor(void) { +// static GPBEnumDescriptor *descriptor = NULL; +// if (!descriptor) { +// static const char *valueNames = +// "Shape\000Rect\000Ellipse\000Keep\000"; +// static const int32_t values[] = { +// SVGAProtoShapeEntity_ShapeType_Shape, +// SVGAProtoShapeEntity_ShapeType_Rect, +// SVGAProtoShapeEntity_ShapeType_Ellipse, +// SVGAProtoShapeEntity_ShapeType_Keep, +// }; +// GPBEnumDescriptor *worker = +// [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeType) +// valueNames:valueNames +// values:values +// count:(uint32_t)(sizeof(values) / sizeof(int32_t)) +// enumVerifier:SVGAProtoShapeEntity_ShapeType_IsValidValue]; +// if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { +// [worker release]; +// } +// } +// return descriptor; +//} GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeType_EnumDescriptor(void) { static GPBEnumDescriptor *descriptor = NULL; - if (!descriptor) { - static const char *valueNames = - "Shape\000Rect\000Ellipse\000Keep\000"; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + static const char *valueNames = "Shape\000Rect\000Ellipse\000Keep\000"; static const int32_t values[] = { SVGAProtoShapeEntity_ShapeType_Shape, SVGAProtoShapeEntity_ShapeType_Rect, SVGAProtoShapeEntity_ShapeType_Ellipse, SVGAProtoShapeEntity_ShapeType_Keep, }; - GPBEnumDescriptor *worker = - [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeType) - valueNames:valueNames - values:values - count:(uint32_t)(sizeof(values) / sizeof(int32_t)) - enumVerifier:SVGAProtoShapeEntity_ShapeType_IsValidValue]; - if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { - [worker release]; - } - } + descriptor = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeType) + valueNames:valueNames + values:values + count:(uint32_t)(sizeof(values) / sizeof(int32_t)) + enumVerifier:SVGAProtoShapeEntity_ShapeType_IsValidValue]; + }); return descriptor; } @@ -1003,31 +1022,51 @@ void SetSVGAProtoShapeEntity_ShapeStyle_LineJoin_RawValue(SVGAProtoShapeEntity_S #pragma mark - Enum SVGAProtoShapeEntity_ShapeStyle_LineCap +//GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeStyle_LineCap_EnumDescriptor(void) { +// static GPBEnumDescriptor *descriptor = NULL; +// if (!descriptor) { +// static const char *valueNames = +// "LineCapButt\000LineCapRound\000LineCapSquare\000"; +// static const int32_t values[] = { +// SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapButt, +// SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapRound, +// SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapSquare, +// }; +// static const char *extraTextFormatInfo = "\003\000\007\344\000\001\007\345\000\002\007\346\000"; +// GPBEnumDescriptor *worker = +// [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineCap) +// valueNames:valueNames +// values:values +// count:(uint32_t)(sizeof(values) / sizeof(int32_t)) +// enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineCap_IsValidValue +// extraTextFormatInfo:extraTextFormatInfo]; +// if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { +// [worker release]; +// } +// } +// return descriptor; +//} + GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeStyle_LineCap_EnumDescriptor(void) { static GPBEnumDescriptor *descriptor = NULL; - if (!descriptor) { - static const char *valueNames = - "LineCapButt\000LineCapRound\000LineCapSquare\000"; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + static const char *valueNames = "LineCapButt\000LineCapRound\000LineCapSquare\000"; static const int32_t values[] = { SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapButt, SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapRound, SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapSquare, }; static const char *extraTextFormatInfo = "\003\000\007\344\000\001\007\345\000\002\007\346\000"; - GPBEnumDescriptor *worker = - [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineCap) - valueNames:valueNames - values:values - count:(uint32_t)(sizeof(values) / sizeof(int32_t)) - enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineCap_IsValidValue - extraTextFormatInfo:extraTextFormatInfo]; - if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { - [worker release]; - } - } + descriptor = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineCap) + valueNames:valueNames + values:values + count:(uint32_t)(sizeof(values) / sizeof(int32_t)) + enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineCap_IsValidValue + extraTextFormatInfo:extraTextFormatInfo]; + }); return descriptor; } - BOOL SVGAProtoShapeEntity_ShapeStyle_LineCap_IsValidValue(int32_t value__) { switch (value__) { case SVGAProtoShapeEntity_ShapeStyle_LineCap_LineCapButt: @@ -1041,29 +1080,50 @@ BOOL SVGAProtoShapeEntity_ShapeStyle_LineCap_IsValidValue(int32_t value__) { #pragma mark - Enum SVGAProtoShapeEntity_ShapeStyle_LineJoin +//GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeStyle_LineJoin_EnumDescriptor(void) { +// static GPBEnumDescriptor *descriptor = NULL; +// if (!descriptor) { +// static const char *valueNames = +// "LineJoinMiter\000LineJoinRound\000LineJoinBeve" +// "l\000"; +// static const int32_t values[] = { +// SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinMiter, +// SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinRound, +// SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinBevel, +// }; +// static const char *extraTextFormatInfo = "\003\000\010\345\000\001\010\345\000\002\010\345\000"; +// GPBEnumDescriptor *worker = +// [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineJoin) +// valueNames:valueNames +// values:values +// count:(uint32_t)(sizeof(values) / sizeof(int32_t)) +// enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineJoin_IsValidValue +// extraTextFormatInfo:extraTextFormatInfo]; +// if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { +// [worker release]; +// } +// } +// return descriptor; +//} + GPBEnumDescriptor *SVGAProtoShapeEntity_ShapeStyle_LineJoin_EnumDescriptor(void) { static GPBEnumDescriptor *descriptor = NULL; - if (!descriptor) { - static const char *valueNames = - "LineJoinMiter\000LineJoinRound\000LineJoinBeve" - "l\000"; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + static const char *valueNames = "LineJoinMiter\000LineJoinRound\000LineJoinBevel\000"; static const int32_t values[] = { SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinMiter, SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinRound, SVGAProtoShapeEntity_ShapeStyle_LineJoin_LineJoinBevel, }; static const char *extraTextFormatInfo = "\003\000\010\345\000\001\010\345\000\002\010\345\000"; - GPBEnumDescriptor *worker = - [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineJoin) - valueNames:valueNames - values:values - count:(uint32_t)(sizeof(values) / sizeof(int32_t)) - enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineJoin_IsValidValue - extraTextFormatInfo:extraTextFormatInfo]; - if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) { - [worker release]; - } - } + descriptor = [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SVGAProtoShapeEntity_ShapeStyle_LineJoin) + valueNames:valueNames + values:values + count:(uint32_t)(sizeof(values) / sizeof(int32_t)) + enumVerifier:SVGAProtoShapeEntity_ShapeStyle_LineJoin_IsValidValue + extraTextFormatInfo:extraTextFormatInfo]; + }); return descriptor; }