Skip to content

Commit e648312

Browse files
noahsmartinnoahsmartin
authored
ref: Remove SDK_V9 checks around SentrySerializable (#6574)
1 parent 08592dd commit e648312

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+247
-306
lines changed

‎Samples/iOS-Swift/iOS-Swift/Tools/SentryExposure.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,4 @@ NS_ASSUME_NONNULL_BEGIN
2121

2222
@end
2323

24-
#if SDK_V9
25-
@interface SentryScope ()
26-
27-
- (NSDictionary *)serialize;
28-
29-
@end
30-
#endif
31-
3224
NS_ASSUME_NONNULL_END

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,6 @@
10381038
FA34C1A32E692A5000BC52AA /* SentryEnvelopeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA34C1A22E692A5000BC52AA /* SentryEnvelopeItem.swift */; };
10391039
FA3734842E0F086C0091EF24 /* SentryDependencyContainerSwiftHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FA3734832E0F07A20091EF24 /* SentryDependencyContainerSwiftHelper.h */; };
10401040
FA3734862E0F09320091EF24 /* SentryDependencyContainerSwiftHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3734852E0F092F0091EF24 /* SentryDependencyContainerSwiftHelper.m */; };
1041-
FA3854362E267DA60045A563 /* SentryUser+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FA3854352E267DA20045A563 /* SentryUser+Serialize.h */; };
10421041
FA3A42722E1C5F9B00A08C39 /* SentryNSNotificationCenterWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA3A42712E1C5F9B00A08C39 /* SentryNSNotificationCenterWrapper.swift */; };
10431042
FA3AEE782E68E2830092283E /* SentryEnvelopeHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA3AEE772E68E2830092283E /* SentryEnvelopeHeader.swift */; };
10441043
FA458CC32E691A730061B13D /* SentryProcessInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA458CBD2E691A6E0061B13D /* SentryProcessInfo.swift */; };
@@ -1122,7 +1121,6 @@
11221121
FAB007522E9FE2FF001C806A /* SentrySwizzleWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB0074C2E9FE2FA001C806A /* SentrySwizzleWrapper.swift */; };
11231122
FAB359982E05D7E90083D5E3 /* SentryEventSwiftHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FAB359972E05D7E90083D5E3 /* SentryEventSwiftHelper.h */; };
11241123
FAB3599A2E05D8080083D5E3 /* SentryEventSwiftHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB359992E05D8080083D5E3 /* SentryEventSwiftHelper.m */; };
1125-
FAB7BBA92E2577A6007301E1 /* SentryModels+Serializable.h in Headers */ = {isa = PBXBuildFile; fileRef = FAB7BBA82E2577A2007301E1 /* SentryModels+Serializable.h */; };
11261124
FABB48B32E59310D0071397E /* SentryMeasurementValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABB48B12E59310D0071397E /* SentryMeasurementValue.swift */; };
11271125
FABE8E152E307A5E0040809A /* SentrySDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABE8E142E307A5C0040809A /* SentrySDK.swift */; };
11281126
FABE8E172E307A7F0040809A /* Dependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABE8E162E307A7C0040809A /* Dependencies.swift */; };
@@ -1138,7 +1136,6 @@
11381136
FAE579CC2E7DE14900B710F9 /* SentryFrameRemover.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579C62E7DE14400B710F9 /* SentryFrameRemover.swift */; };
11391137
FAE57BF72E83049E00B710F9 /* SentryDisplayLinkWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE57BF12E83049900B710F9 /* SentryDisplayLinkWrapper.swift */; };
11401138
FAE57C082E83092E00B710F9 /* SentryDispatchFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE57C072E83092A00B710F9 /* SentryDispatchFactory.swift */; };
1141-
FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
11421139
FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
11431140
FAEEBFE22E736D4B00E79CA9 /* SentryViewHierarchyProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEEBFDC2E736D4100E79CA9 /* SentryViewHierarchyProvider.swift */; };
11441141
FAEEBFEA2E74517B00E79CA9 /* SentryFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEEBFE92E74517800E79CA9 /* SentryFileManager.swift */; };
@@ -2419,7 +2416,6 @@
24192416
FA34C1A22E692A5000BC52AA /* SentryEnvelopeItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryEnvelopeItem.swift; sourceTree = "<group>"; };
24202417
FA3734832E0F07A20091EF24 /* SentryDependencyContainerSwiftHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDependencyContainerSwiftHelper.h; path = include/SentryDependencyContainerSwiftHelper.h; sourceTree = "<group>"; };
24212418
FA3734852E0F092F0091EF24 /* SentryDependencyContainerSwiftHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDependencyContainerSwiftHelper.m; sourceTree = "<group>"; };
2422-
FA3854352E267DA20045A563 /* SentryUser+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryUser+Serialize.h"; path = "include/SentryUser+Serialize.h"; sourceTree = "<group>"; };
24232419
FA3A42712E1C5F9B00A08C39 /* SentryNSNotificationCenterWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryNSNotificationCenterWrapper.swift; sourceTree = "<group>"; };
24242420
FA3AEE772E68E2830092283E /* SentryEnvelopeHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryEnvelopeHeader.swift; sourceTree = "<group>"; };
24252421
FA458CBD2E691A6E0061B13D /* SentryProcessInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryProcessInfo.swift; sourceTree = "<group>"; };
@@ -2504,7 +2500,6 @@
25042500
FAB0074C2E9FE2FA001C806A /* SentrySwizzleWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySwizzleWrapper.swift; sourceTree = "<group>"; };
25052501
FAB359972E05D7E90083D5E3 /* SentryEventSwiftHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryEventSwiftHelper.h; path = include/SentryEventSwiftHelper.h; sourceTree = "<group>"; };
25062502
FAB359992E05D8080083D5E3 /* SentryEventSwiftHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryEventSwiftHelper.m; sourceTree = "<group>"; };
2507-
FAB7BBA82E2577A2007301E1 /* SentryModels+Serializable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryModels+Serializable.h"; path = "include/SentryModels+Serializable.h"; sourceTree = "<group>"; };
25082503
FABB48B12E59310D0071397E /* SentryMeasurementValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryMeasurementValue.swift; sourceTree = "<group>"; };
25092504
FABE8E142E307A5C0040809A /* SentrySDK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDK.swift; sourceTree = "<group>"; };
25102505
FABE8E162E307A7C0040809A /* Dependencies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dependencies.swift; sourceTree = "<group>"; };
@@ -2520,7 +2515,6 @@
25202515
FAE579C62E7DE14400B710F9 /* SentryFrameRemover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFrameRemover.swift; sourceTree = "<group>"; };
25212516
FAE57BF12E83049900B710F9 /* SentryDisplayLinkWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDisplayLinkWrapper.swift; sourceTree = "<group>"; };
25222517
FAE57C072E83092A00B710F9 /* SentryDispatchFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDispatchFactory.swift; sourceTree = "<group>"; };
2523-
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
25242518
FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
25252519
FAEC273E2DF393E000878871 /* NSData+Unzip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Unzip.h"; sourceTree = "<group>"; };
25262520
FAEEBFDC2E736D4100E79CA9 /* SentryViewHierarchyProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyProvider.swift; sourceTree = "<group>"; };
@@ -2764,7 +2758,6 @@
27642758
639FCF961EBC7B9700778193 /* SentryEvent.h */,
27652759
639FCF971EBC7B9700778193 /* SentryEvent.m */,
27662760
D880E3B02860A5A0008A90DB /* SentryEvent+Private.h */,
2767-
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */,
27682761
639FCF9E1EBC804600778193 /* SentryException.h */,
27692762
639FCF9F1EBC804600778193 /* SentryException.m */,
27702763
6334313F20AD9AE40077E581 /* SentryMechanism.h */,
@@ -2784,7 +2777,6 @@
27842777
843FB3212D0CD04D00558F18 /* SentryUserAccess.h */,
27852778
843FB3222D0CD04D00558F18 /* SentryUserAccess.m */,
27862779
92F6726A29C8B7B000BFD34D /* SentryUser+Private.h */,
2787-
FA3854352E267DA20045A563 /* SentryUser+Serialize.h */,
27882780
9286059429A5096600F96038 /* SentryGeo.h */,
27892781
9286059629A5098900F96038 /* SentryGeo.m */,
27902782
63B818F71EC34639002FDF4C /* SentryDebugMeta.h */,
@@ -2974,7 +2966,6 @@
29742966
639889BA1EDED18400EA7442 /* SentrySwizzle.m */,
29752967
7BC63F0728081242009D9E37 /* SentrySwizzleWrapperHelper.h */,
29762968
7BC63F0928081288009D9E37 /* SentrySwizzleWrapperHelper.m */,
2977-
FAB7BBA82E2577A2007301E1 /* SentryModels+Serializable.h */,
29782969
7B8ECBF926498906005FE2EF /* SentryDefaultAppStateManager.h */,
29792970
7B8ECBFB26498958005FE2EF /* SentryDefaultAppStateManager.m */,
29802971
7BD86EC4264A63F6005439DB /* SentrySysctlObjC.h */,
@@ -5107,7 +5098,6 @@
51075098
7BAF3DD92440AEC8008A5414 /* SentryRequestManager.h in Headers */,
51085099
62862B1C2B1DDBC8009B16E3 /* SentryDelayedFrame.h in Headers */,
51095100
627E7589299F6FE40085504D /* SentryInternalDefines.h in Headers */,
5110-
FA3854362E267DA60045A563 /* SentryUser+Serialize.h in Headers */,
51115101
7D0637032382B34300B30749 /* SentryScope.h in Headers */,
51125102
03F84D2727DD414C008FE43F /* SentryMachLogging.hpp in Headers */,
51135103
63295AF51EF3C7DB002D4490 /* SentryNSDictionarySanitize.h in Headers */,
@@ -5224,7 +5214,6 @@
52245214
7B96572026830C9100C66E25 /* SentryScopeSyncC.h in Headers */,
52255215
63FE70EB20DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.h in Headers */,
52265216
D456B4362D706BF2007068CB /* SentryTraceOrigin.h in Headers */,
5227-
FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */,
52285217
7BD86ECF264A7C77005439DB /* SentryAppStartMeasurement.h in Headers */,
52295218
0354A22B2A134D9C003C3A04 /* SentryProfilerState.h in Headers */,
52305219
7DC8310A2398283C0043DD9A /* SentryCrashIntegration.h in Headers */,
@@ -5314,7 +5303,6 @@
53145303
848A451E2BBF9504006AAAEC /* SentryProfilerTestHelpers.h in Headers */,
53155304
639FCF9C1EBC7F9500778193 /* SentryThread.h in Headers */,
53165305
63FE716B20DA4C1100CDBAE8 /* SentryCrashJSONCodecObjC.h in Headers */,
5317-
FAB7BBA92E2577A6007301E1 /* SentryModels+Serializable.h in Headers */,
53185306
63AA76A51EB9CBC200D153DE /* SentryDsn.h in Headers */,
53195307
844EDD6C2949387000C86F34 /* SentryMetricProfiler.h in Headers */,
53205308
F452438A2DE65968003E8F50 /* ExceptionCatcher.h in Headers */,

‎Sources/Sentry/Profiling/SentryProfilerSerialization.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# import "SentryLogC.h"
1313
# import "SentryMeta.h"
1414
# import "SentryMetricProfiler.h"
15-
# import "SentryModels+Serializable.h"
1615
# import "SentryProfileTimeseries.h"
1716
# import "SentryProfiledTracerConcurrency.h"
1817
# import "SentryProfiler+Private.h"

‎Sources/Sentry/Public/SentryBreadcrumb.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

1513
NS_SWIFT_NAME(Breadcrumb)
16-
@interface SentryBreadcrumb : NSObject
17-
#if !SDK_V9
18-
<SentrySerializable>
19-
#endif
14+
@interface SentryBreadcrumb : NSObject <SentrySerializable>
2015

2116
/**
2217
* Level of breadcrumb

‎Sources/Sentry/Public/SentryDebugMeta.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

@@ -22,10 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
2220
* @c SentryDebugImage in a future version.
2321
*/
2422
NS_SWIFT_NAME(DebugMeta)
25-
@interface SentryDebugMeta : NSObject
26-
#if !SDK_V9
27-
<SentrySerializable>
28-
#endif
23+
@interface SentryDebugMeta : NSObject <SentrySerializable>
2924

3025
/**
3126
* Identifier of the dynamic library or executable. It is the value of the @c LC_UUID load command

‎Sources/Sentry/Public/SentryEnvelopeItemHeader.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
#else
66
# import <SentryDefines.h>
77
#endif
8-
#if !SDK_V9
9-
# import SENTRY_HEADER(SentrySerializable)
10-
#endif
8+
#import SENTRY_HEADER(SentrySerializable)
119

1210
NS_ASSUME_NONNULL_BEGIN
1311

14-
@interface SentryEnvelopeItemHeader : NSObject
15-
#if !SDK_V9
16-
<SentrySerializable>
17-
#endif
12+
@interface SentryEnvelopeItemHeader : NSObject <SentrySerializable>
1813

1914
SENTRY_NO_INIT
2015

‎Sources/Sentry/Public/SentryEvent.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif // !SDK_V9
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

@@ -24,10 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
2422
@class SentryUser;
2523

2624
NS_SWIFT_NAME(Event)
27-
@interface SentryEvent : NSObject
28-
#if !SDK_V9
29-
<SentrySerializable>
30-
#endif // !SDK_V9
25+
@interface SentryEvent : NSObject <SentrySerializable>
3126

3227
/**
3328
* This will be set by the initializer.

‎Sources/Sentry/Public/SentryException.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,15 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

1513
@class SentryMechanism;
1614
@class SentryStacktrace;
1715

1816
NS_SWIFT_NAME(Exception)
19-
@interface SentryException : NSObject
20-
#if !SDK_V9
21-
<SentrySerializable>
22-
#endif
17+
@interface SentryException : NSObject <SentrySerializable>
2318

2419
SENTRY_NO_INIT
2520

‎Sources/Sentry/Public/SentryFrame.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

1513
NS_SWIFT_NAME(Frame)
16-
@interface SentryFrame : NSObject
17-
#if !SDK_V9
18-
<SentrySerializable>
19-
#endif
14+
@interface SentryFrame : NSObject <SentrySerializable>
2015

2116
/**
2217
* SymbolAddress of the frame

‎Sources/Sentry/Public/SentryGeo.h‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#else
77
# import <SentryDefines.h>
88
#endif
9-
#if !SDK_V9
10-
# import SENTRY_HEADER(SentrySerializable)
11-
#endif
9+
#import SENTRY_HEADER(SentrySerializable)
1210

1311
NS_ASSUME_NONNULL_BEGIN
1412

@@ -23,12 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
2321
/// }
2422
/// }
2523
NS_SWIFT_NAME(Geo)
26-
@interface SentryGeo : NSObject
27-
#if !SDK_V9
28-
<SentrySerializable, NSCopying>
29-
#else
30-
<NSCopying>
31-
#endif
24+
@interface SentryGeo : NSObject <SentrySerializable, NSCopying>
3225

3326
/**
3427
* Optional: Human readable city name.

0 commit comments

Comments
 (0)