ref: Make serializable conformance internal

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -1137,7 +1137,6 @@
 		FAE579CC2E7DE14900B710F9 /* SentryFrameRemover.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579C62E7DE14400B710F9 /* SentryFrameRemover.swift */; };
 		FAE57BF72E83049E00B710F9 /* SentryDisplayLinkWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE57BF12E83049900B710F9 /* SentryDisplayLinkWrapper.swift */; };
 		FAE57C082E83092E00B710F9 /* SentryDispatchFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE57C072E83092A00B710F9 /* SentryDispatchFactory.swift */; };
-		FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
 		FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
 		FAEEBFE22E736D4B00E79CA9 /* SentryViewHierarchyProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEEBFDC2E736D4100E79CA9 /* SentryViewHierarchyProvider.swift */; };
 		FAEEBFEA2E74517B00E79CA9 /* SentryFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEEBFE92E74517800E79CA9 /* SentryFileManager.swift */; };
@@ -2518,7 +2517,6 @@
 		FAE579C62E7DE14400B710F9 /* SentryFrameRemover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFrameRemover.swift; sourceTree = "<group>"; };
 		FAE57BF12E83049900B710F9 /* SentryDisplayLinkWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDisplayLinkWrapper.swift; sourceTree = "<group>"; };
 		FAE57C072E83092A00B710F9 /* SentryDispatchFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDispatchFactory.swift; sourceTree = "<group>"; };
-		FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
 		FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
 		FAEC273E2DF393E000878871 /* NSData+Unzip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Unzip.h"; sourceTree = "<group>"; };
 		FAEEBFDC2E736D4100E79CA9 /* SentryViewHierarchyProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyProvider.swift; sourceTree = "<group>"; };
@@ -2761,7 +2759,6 @@
 				639FCF961EBC7B9700778193 /* SentryEvent.h */,
 				639FCF971EBC7B9700778193 /* SentryEvent.m */,
 				D880E3B02860A5A0008A90DB /* SentryEvent+Private.h */,
-				FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */,
 				639FCF9E1EBC804600778193 /* SentryException.h */,
 				639FCF9F1EBC804600778193 /* SentryException.m */,
 				6334313F20AD9AE40077E581 /* SentryMechanism.h */,
@@ -5212,7 +5209,6 @@
 				7B96572026830C9100C66E25 /* SentryScopeSyncC.h in Headers */,
 				63FE70EB20DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.h in Headers */,
 				D456B4362D706BF2007068CB /* SentryTraceOrigin.h in Headers */,
-				FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */,
 				7BD86ECF264A7C77005439DB /* SentryAppStartMeasurement.h in Headers */,
 				0354A22B2A134D9C003C3A04 /* SentryProfilerState.h in Headers */,
 				7DC8310A2398283C0043DD9A /* SentryCrashIntegration.h in Headers */,

Sources/Sentry/Public/SentryEvent.h

@@ -6,9 +6,6 @@
 #else
 #    import <SentryDefines.h>
 #endif
-#if !SDK_V9
-#    import SENTRY_HEADER(SentrySerializable)
-#endif // !SDK_V9
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -25,9 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_SWIFT_NAME(Event)
 @interface SentryEvent : NSObject
-#if !SDK_V9
-                         <SentrySerializable>
-#endif // !SDK_V9
 
 /**
  * This will be set by the initializer.

Sources/Sentry/SentryFileManagerHelper.m

@@ -4,7 +4,7 @@
 #import "SentryDsn.h"
 #import "SentryEnvelopeItemHeader.h"
 #import "SentryError.h"
-#import "SentryEvent+Serialize.h"
+#import "SentryEvent+Private.h"
 #import "SentryEvent.h"
 #import "SentryInternalDefines.h"
 #import "SentryLogC.h"

Sources/Sentry/SentryTransaction.m

@@ -1,5 +1,5 @@
 #import "SentryTransaction.h"
-#import "SentryEvent+Serialize.h"
+#import "SentryEvent+Private.h"
 #import "SentryInternalDefines.h"
 #import "SentryNSDictionarySanitize.h"
 #import "SentryProfilingConditionals.h"

Sources/Sentry/include/SentryEvent+Private.h

@@ -3,6 +3,8 @@
 #import "SentryProfilingConditionals.h"
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SentryEvent ()
 
 /**
@@ -26,6 +28,8 @@
  */
 @property (nonatomic, strong) NSArray *serializedBreadcrumbs;
 
+- (NSDictionary<NSString *, id> *)serialize;
+
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 @property (nonatomic) uint64_t startSystemTime;
 @property (nonatomic) uint64_t endSystemTime;
@@ -36,3 +40,5 @@
 #endif // SENTRY_HAS_METRIC_KIT
 
 @end
+
+NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryEvent+Serialize.h

@@ -28,10 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface SentryEvent () <SentryInternalSerializable>
-
-@end
-
 @interface SentryStacktrace () <SentryInternalSerializable>
 
 @end

Sources/Sentry/include/SentryModels+Serializable.h

@@ -41,7 +41,7 @@
 #import "SentryDelayedFramesTracker.h"
 #import "SentryDependencyContainerSwiftHelper.h"
 #import "SentryDeviceContextKeys.h"
-#import "SentryEvent+Serialize.h"
+#import "SentryEvent+Private.h"
 #import "SentryFileIOTrackerHelper.h"
 #import "SentryFileManagerHelper.h"
 #import "SentryLevelHelper.h"

Sources/Sentry/include/SentryPrivate.h

@@ -32,7 +32,7 @@ import Foundation
         self.type = "replay_video"
     }
 
-    required convenience init() {
+    required convenience override init() {
         fatalError("init() has not been implemented")
     }
 

Sources/Swift/Integrations/SessionReplay/SentryReplayEvent.swift

@@ -5,7 +5,7 @@ PLATFORM="${1:-ios}"
 POD_SPEC=${2:-Sentry}
 LIBRARY_TYPE="${3:-dynamic}"
 INCLUDE_POD_SPECS=""
-EXTRA_ARGS=""
+EXTRA_ARGS="--allow-warnings"
 
 case $POD_SPEC in