Merge branch 'main' into itay/cocoa-547-convert-sentryscreenframes-to-swift

Author: itaybre

CHANGELOG.md

@@ -4,8 +4,9 @@
 
 ### Fixes
 
-- Fix potential app launch hang caused by the SentrySDK (#6181) Fixed by removing the call to `_dyld_get_image_header` on the main thread.
-- Fix dyanmic selector crash in SentryReplayRecording (#6211)
+- Fix potential app launch hang caused by the SentrySDK (#6181)
+  Fixed by removing the call to `_dyld_get_image_header` on the main thread.
+- Fix dynamic selector crash in SentryReplayRecording (#6211)
 
 ## 8.56.0
 

Sentry.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 #import "SentryDependencyContainer.h"
 #import "SentryDispatchFactory.h"
 #import "SentryFileManager+Test.h"
-#import "SentryGlobalEventProcessor.h"
 #import "SentryHub+Private.h"
 #import "SentryHub+Test.h"
 #import "SentryLogC.h"

SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h

@@ -17,7 +17,6 @@
 #import "SentrySessionReplayIntegration+Private.h"
 #import "SentrySwift.h"
 #import "SentryUser+Private.h"
-#import "SentryViewHierarchyProvider.h"
 #import <SentryBreadcrumb.h>
 #import <SentryDependencyContainer.h>
 #import <SentryFramesTracker.h>

Sources/Sentry/PrivateSentrySDKOnly.m

@@ -3,6 +3,7 @@
 #import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentrySerialization.h"
+#import "SentrySwift.h"
 
 @interface SentryWatchdogTerminationBreadcrumbProcessor ()
 
@@ -40,7 +41,7 @@ - (void)dealloc
 - (void)addSerializedBreadcrumb:(NSDictionary *)crumb
 {
     SENTRY_LOG_DEBUG(@"Adding breadcrumb: %@", crumb);
-    NSData *_Nullable jsonData = [SentrySerialization dataWithJSONObject:crumb];
+    NSData *_Nullable jsonData = [SentrySerializationSwift dataWithJSONObject:crumb];
     if (jsonData == nil) {
         SENTRY_LOG_ERROR(@"Error serializing breadcrumb to JSON");
         return;

Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m

@@ -331,7 +331,7 @@
         return nil;
     }
 
-    NSData *JSONData = [SentrySerialization dataWithJSONObject:payload];
+    NSData *JSONData = [SentrySerializationSwift dataWithJSONObject:payload];
     if (JSONData == nil) {
         SENTRY_LOG_DEBUG(@"Failed to encode profile to JSON.");
         return nil;
@@ -396,7 +396,7 @@
     payload[@"transaction"] = transactionDict;
     payload[@"timestamp"] = sentry_toIso8601String(startTimestamp);
 
-    NSData *JSONData = [SentrySerialization dataWithJSONObject:payload];
+    NSData *JSONData = [SentrySerializationSwift dataWithJSONObject:payload];
     if (JSONData == nil) {
         SENTRY_LOG_DEBUG(@"Failed to encode profile to JSON.");
         return nil;

Sources/Sentry/Profiling/SentryProfilerSerialization.m

@@ -2,7 +2,6 @@
 #import "SentryDependencyContainer.h"
 #import "SentryLogC.h"
 #import "SentrySwift.h"
-#import "SentryThreadWrapper.h"
 #import <stdatomic.h>
 
 NS_ASSUME_NONNULL_BEGIN

Sources/Sentry/SentryANRTrackerV1.m

@@ -6,7 +6,6 @@
 #    import "SentryFramesTracker.h"
 #    import "SentryLogC.h"
 #    import "SentrySwift.h"
-#    import "SentryThreadWrapper.h"
 #    import "SentryTime.h"
 #    import <stdatomic.h>
 

Sources/Sentry/SentryANRTrackerV2.m

@@ -14,7 +14,6 @@
 #import "SentrySwift.h"
 #import "SentryThread.h"
 #import "SentryThreadInspector.h"
-#import "SentryThreadWrapper.h"
 #import <SentryOptions+Private.h>
 
 #if SENTRY_HAS_UIKIT

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -7,7 +7,6 @@
 #    import "SentryDefines.h"
 #    import "SentryFramesTracker.h"
 #    import "SentryLogC.h"
-#    import "SentrySysctl.h"
 #    import <PrivateSentrySDKOnly.h>
 #    import <SentryDependencyContainer.h>
 #    import <SentryInternalDefines.h>