chore(deps): update Cocoa SDK (iOS and Mac) to v8.54.0 (#1032)

github-actions[bot] · web-flow · tustanivsky · web-flow · commit 726ad93a6ab0 · 2025-08-06T16:13:05.000+03:00
* chore: update modules/sentry-cocoa.properties to 8.54.0

* Update package snapshot

* Remove legacy define

* Update cocoa class loading for Mac

* Format code

---------

Co-authored-by: GitHub &lt;noreply@github.com&gt;
Co-authored-by: Ivan Tustanivskyi &lt;tustanivsky@gmail.com&gt;
Co-authored-by: Sentry Github Bot &lt;bot+github-bot@sentry.io&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@
 - Bump Java SDK (Android) from v8.17.0 to v8.18.0 ([#1031](https://github.com/getsentry/sentry-unreal/pull/1031))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8180)
   - [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.18.0)
+- Bump Cocoa SDK (iOS and Mac) from v8.53.2 to v8.54.0 ([#1032](https://github.com/getsentry/sentry-unreal/pull/1032))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8540)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.53.2...8.54.0)
 
 ## 1.0.0-beta.7
 
diff --git a/modules/sentry-cocoa.properties b/modules/sentry-cocoa.properties
@@ -1,2 +1,2 @@
-version=8.53.2
+version=8.54.0
 repo=https://github.com/getsentry/sentry-cocoa
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentryId.cpp b/plugin-dev/Source/Sentry/Private/Apple/AppleSentryId.cpp
@@ -7,20 +7,12 @@
 
 FAppleSentryId::FAppleSentryId()
 {
-#if PLATFORM_MAC
-	IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] init];
-#elif PLATFORM_IOS
 	IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] init];
-#endif
 }
 
 FAppleSentryId::FAppleSentryId(const FString& id)
 {
-#if PLATFORM_MAC
-	IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] initWithUUIDString:id.GetNSString()];
-#elif PLATFORM_IOS
 	IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] initWithUUIDString:id.GetNSString()];
-#endif
 }
 
 FAppleSentryId::FAppleSentryId(SentryId* id)
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp
@@ -395,11 +395,7 @@ TSharedPtr<ISentryTransactionContext> FAppleSentrySubsystem::ContinueTrace(const
 		sampleDecision = traceParts[2].Equals(TEXT("1")) ? kSentrySampleDecisionYes : kSentrySampleDecisionNo;
 	}
 
-#if PLATFORM_MAC
-	SentryId* traceId = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] initWithUUIDString:traceParts[0].GetNSString()];
-#elif PLATFORM_IOS
 	SentryId* traceId = [[SENTRY_APPLE_CLASS(SentryId) alloc] initWithUUIDString:traceParts[0].GetNSString()];
-#endif
 
 	SentryTransactionContext* transactionContext = [[SENTRY_APPLE_CLASS(SentryTransactionContext) alloc] initWithName:@"<unlabeled transaction>" operation:@"default"
 																											  traceId:traceId
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentryUserFeedback.cpp b/plugin-dev/Source/Sentry/Private/Apple/AppleSentryUserFeedback.cpp
@@ -13,21 +13,12 @@ FAppleSentryUserFeedback::FAppleSentryUserFeedback(TSharedPtr<ISentryId> eventId
 	TSharedPtr<FAppleSentryId> idIOS = StaticCastSharedPtr<FAppleSentryId>(eventId);
 	SentryId* id = idIOS->GetNativeObject();
 
-#if PLATFORM_MAC
-	UserFeedbackApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry14SentryFeedback) alloc] initWithMessage:@""
-																							name:nil
-																						   email:nil
-																						  source:SentryFeedbackSourceCustom
-																			   associatedEventId:id
-																					 attachments:nil];
-#elif PLATFORM_IOS
 	UserFeedbackApple = [[SENTRY_APPLE_CLASS(SentryFeedback) alloc] initWithMessage:@""
 																			   name:nil
 																			  email:nil
 																			 source:SentryFeedbackSourceCustom
 																  associatedEventId:id
 																		attachments:nil];
-#endif
 }
 
 FAppleSentryUserFeedback::~FAppleSentryUserFeedback()
@@ -80,19 +71,10 @@ SentryFeedback* FAppleSentryUserFeedback::CreateSentryFeedback(TSharedPtr<FApple
 	TSharedPtr<FAppleSentryId> idIOS = StaticCastSharedPtr<FAppleSentryId>(feedback->EventId);
 	SentryId* id = idIOS->GetNativeObject();
 
-#if PLATFORM_MAC
-	return [[SENTRY_APPLE_CLASS(_TtC6Sentry14SentryFeedback) alloc] initWithMessage:feedback->Comment.GetNSString()
-																			   name:feedback->Name.GetNSString()
-																			  email:feedback->Email.GetNSString()
-																			 source:SentryFeedbackSourceCustom
-																  associatedEventId:id
-																		attachments:nil];
-#elif PLATFORM_IOS
 	return [[SENTRY_APPLE_CLASS(SentryFeedback) alloc] initWithMessage:feedback->Comment.GetNSString()
 																  name:feedback->Name.GetNSString()
 																 email:feedback->Email.GetNSString()
 																source:SentryFeedbackSourceCustom
 													 associatedEventId:id
 														   attachments:nil];
-#endif
 }
diff --git a/plugin-dev/Source/Sentry/Private/Apple/Convenience/AppleSentryMacro.h b/plugin-dev/Source/Sentry/Private/Apple/Convenience/AppleSentryMacro.h
@@ -8,7 +8,7 @@
 
 #if PLATFORM_MAC
 	#define SENTRY_APPLE_CLASS(Name) \
-		(__bridge Class) dlsym(FSentryModule::Get().GetSentryLibHandle(), "OBJC_CLASS_$_" #Name)
+		FSentryModule::Get().GetSentryCocoaClass(#Name)
 #elif PLATFORM_IOS
 	#define SENTRY_APPLE_CLASS(Name) \
 		Name
diff --git a/plugin-dev/Source/Sentry/Private/SentryModule.cpp b/plugin-dev/Source/Sentry/Private/SentryModule.cpp
@@ -128,10 +128,30 @@ bool FSentryModule::IsMarketplaceVersion()
 }
 
 #if PLATFORM_MAC
+
 void* FSentryModule::GetSentryLibHandle() const
 {
 	return mDllHandleSentry;
 }
+
+Class FSentryModule::GetSentryCocoaClass(const ANSICHAR* ClassName)
+{
+	ANSICHAR ClassNamePattern[256];
+	FCStringAnsi::Snprintf(ClassNamePattern, sizeof(ClassNamePattern), "OBJC_CLASS_$_%s", ClassName);
+	Class FoundClass = (__bridge Class)dlsym(GetSentryLibHandle(), ClassNamePattern);
+
+	if (!FoundClass)
+	{
+		// Try to load with Swift mangled class name
+		ANSICHAR MangledClassNamePattern[256];
+		int32 ClassNameLen = FCStringAnsi::Strlen(ClassName);
+		FCStringAnsi::Snprintf(MangledClassNamePattern, sizeof(MangledClassNamePattern), "OBJC_CLASS_$__TtC6Sentry%d%s", ClassNameLen, ClassName);
+		FoundClass = (__bridge Class)dlsym(GetSentryLibHandle(), MangledClassNamePattern);
+	}
+
+	return FoundClass;
+}
+
 #endif
 
 #undef LOCTEXT_NAMESPACE
diff --git a/plugin-dev/Source/Sentry/Public/SentryModule.h b/plugin-dev/Source/Sentry/Public/SentryModule.h
@@ -47,6 +47,19 @@ class SENTRY_API FSentryModule : public IModuleInterface
 #if PLATFORM_MAC
 	/** Gets handle to dynamically loaded sentry library. */
 	void* GetSentryLibHandle() const;
+
+	/** Gets an Objective-C/Swift class from the dynamically loaded sentry library.
+	 *
+	 * @param ClassName The unqualified class name (e.g., "SentrySDK", "SentryId")
+	 * @return The Objective-C/Swift Class object if found, nil otherwise
+	 *
+	 * @note: First tries pattern OBJC_CLASS_$_{ClassName}
+	 * Then tries Swift mangled pattern OBJC_CLASS_$__TtC6Sentry{len}{ClassName} where:
+	 * `_Tt` is Swift type symbol prefix
+	 * `C6Sentry` is a class (`C`) in the Sentry module (`6Sentry` means the module name is 6 characters long)
+	 * {len} is the length of the class name as a decimal string
+	 */
+	Class GetSentryCocoaClass(const ANSICHAR* ClassName);
 #endif
 
 	static const FName ModuleName;
diff --git a/plugin-dev/Source/Sentry/Sentry.Build.cs b/plugin-dev/Source/Sentry/Sentry.Build.cs
@@ -61,7 +61,6 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
 			PublicDefinitions.Add("SENTRY_NO_UIKIT=0");
 			PublicDefinitions.Add("APPLICATION_EXTENSION_API_ONLY_NO=0");
 			PublicDefinitions.Add("SDK_V9=0");
-			PublicDefinitions.Add("SDK_v9=0");
 		}
 		else if (Target.Platform == UnrealTargetPlatform.Mac)
 		{
@@ -76,7 +75,6 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
 			PublicDefinitions.Add("SENTRY_NO_UIKIT=1");
 			PublicDefinitions.Add("APPLICATION_EXTENSION_API_ONLY_NO=0");
 			PublicDefinitions.Add("SDK_V9=0");
-			PublicDefinitions.Add("SDK_v9=0");
 		}
 		else if (Target.Platform == UnrealTargetPlatform.Android)
 		{
diff --git a/scripts/packaging/package.snapshot b/scripts/packaging/package.snapshot
@@ -269,7 +269,6 @@ Source/ThirdParty/IOS/Sentry.framework/Headers/SentryRequest.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySampleDecision.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySamplingContext.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryScope.h
-Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySDK.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySerializable.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySpanContext.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySpanId.h
@@ -315,8 +314,8 @@ Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryInternalSerializable
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryLogC.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryNSDataUtils.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryNSDictionarySanitize.h
-Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryOptions+HybridSDKs.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryOptions+Private.h
+Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryOptionsInternal.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryRequestOperation.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryScreenFrames.h
 Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySDK+Private.h
@@ -399,8 +398,8 @@ Source/ThirdParty/Mac/include/Sentry/SentryNSDataUtils.h
 Source/ThirdParty/Mac/include/Sentry/SentryNSDictionarySanitize.h
 Source/ThirdParty/Mac/include/Sentry/SentryNSError.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions.h
-Source/ThirdParty/Mac/include/Sentry/SentryOptions+HybridSDKs.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions+Private.h
+Source/ThirdParty/Mac/include/Sentry/SentryOptionsInternal.h
 Source/ThirdParty/Mac/include/Sentry/SentryProfilingConditionals.h
 Source/ThirdParty/Mac/include/Sentry/SentryReplayApi.h
 Source/ThirdParty/Mac/include/Sentry/SentryRequest.h
@@ -409,7 +408,6 @@ Source/ThirdParty/Mac/include/Sentry/SentrySampleDecision.h
 Source/ThirdParty/Mac/include/Sentry/SentrySamplingContext.h
 Source/ThirdParty/Mac/include/Sentry/SentryScope.h
 Source/ThirdParty/Mac/include/Sentry/SentryScreenFrames.h
-Source/ThirdParty/Mac/include/Sentry/SentrySDK.h
 Source/ThirdParty/Mac/include/Sentry/SentrySDK+Private.h
 Source/ThirdParty/Mac/include/Sentry/SentrySdkInfo.h
 Source/ThirdParty/Mac/include/Sentry/SentrySerializable.h

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-version=8.53.2`
	`1`	`+version=8.54.0`
`2`	`2`	`repo=https://github.com/getsentry/sentry-cocoa`
Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,12 @@`
`7`	`7`
`8`	`8`	`FAppleSentryId::FAppleSentryId()`
`9`	`9`	`{`
`10`		`-#if PLATFORM_MAC`
`11`		`- IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] init];`
`12`		`-#elif PLATFORM_IOS`
`13`	`10`	`IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] init];`
`14`		`-#endif`
`15`	`11`	`}`
`16`	`12`
`17`	`13`	`FAppleSentryId::FAppleSentryId(const FString& id)`
`18`	`14`	`{`
`19`		`-#if PLATFORM_MAC`
`20`		`- IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] initWithUUIDString:id.GetNSString()];`
`21`		`-#elif PLATFORM_IOS`
`22`	`15`	`IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] initWithUUIDString:id.GetNSString()];`
`23`		`-#endif`
`24`	`16`	`}`
`25`	`17`
`26`	`18`	`FAppleSentryId::FAppleSentryId(SentryId* id)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)`
`61`	`61`	`PublicDefinitions.Add("SENTRY_NO_UIKIT=0");`
`62`	`62`	`PublicDefinitions.Add("APPLICATION_EXTENSION_API_ONLY_NO=0");`
`63`	`63`	`PublicDefinitions.Add("SDK_V9=0");`
`64`		`- PublicDefinitions.Add("SDK_v9=0");`
`65`	`64`	`}`
`66`	`65`	`else if (Target.Platform == UnrealTargetPlatform.Mac)`
`67`	`66`	`{`
`@@ -76,7 +75,6 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)`
`76`	`75`	`PublicDefinitions.Add("SENTRY_NO_UIKIT=1");`
`77`	`76`	`PublicDefinitions.Add("APPLICATION_EXTENSION_API_ONLY_NO=0");`
`78`	`77`	`PublicDefinitions.Add("SDK_V9=0");`
`79`		`- PublicDefinitions.Add("SDK_v9=0");`
`80`	`78`	`}`
`81`	`79`	`else if (Target.Platform == UnrealTargetPlatform.Android)`
`82`	`80`	`{`