Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG-v9.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Removes deprecated useSpan function (#5591)
Removes deprecated SentryDebugImageProvider class (#5598)
Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
Removes public SentrySerializable conformance from many public models (#5636)
Removes public SentrySerializable conformance from many public models (#5636, #5840)
Removes Decodable conformances from the public API of model classes (#5691)
Removes enableTracing property from SentryOptions (#5694)
Removes `integrations` property from `SentryOptions` (#5749)
Expand Down
4 changes: 4 additions & 0 deletions Sentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,7 @@
FACEED132E3179A10007B4AC /* SentyOptionsInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = FACEED122E3179A10007B4AC /* SentyOptionsInternal.m */; };
FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
FAEC270E2DF3526000878871 /* SentryUserFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */; };
FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -2465,6 +2466,7 @@
FACEED122E3179A10007B4AC /* SentyOptionsInternal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentyOptionsInternal.m; sourceTree = "<group>"; };
FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedback.swift; 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>"; };
Expand Down Expand Up @@ -2689,6 +2691,7 @@
639FCF961EBC7B9700778193 /* SentryEvent.h */,
639FCF971EBC7B9700778193 /* SentryEvent.m */,
D880E3B02860A5A0008A90DB /* SentryEvent+Private.h */,
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */,
639FCF9E1EBC804600778193 /* SentryException.h */,
639FCF9F1EBC804600778193 /* SentryException.m */,
6334313F20AD9AE40077E581 /* SentryMechanism.h */,
Expand Down Expand Up @@ -5092,6 +5095,7 @@
63FE70EB20DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.h in Headers */,
7B30B67C26527886006B2752 /* SentryDisplayLinkWrapper.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 */,
Expand Down
9 changes: 7 additions & 2 deletions Sources/Sentry/Public/SentryEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#else
# import <SentryDefines.h>
#endif
#import SENTRY_HEADER(SentrySerializable)
#if !SDK_V9
# import SENTRY_HEADER(SentrySerializable)
#endif // !SDK_V9

NS_ASSUME_NONNULL_BEGIN

Expand All @@ -22,7 +24,10 @@ NS_ASSUME_NONNULL_BEGIN
@class SentryUser;

NS_SWIFT_NAME(Event)
@interface SentryEvent : NSObject <SentrySerializable>
@interface SentryEvent : NSObject
#if !SDK_V9
<SentrySerializable>
#endif // !SDK_V9

/**
* This will be set by the initializer.
Expand Down
1 change: 1 addition & 0 deletions Sources/Sentry/SentryEnvelope.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#import "SentryEnvelopeAttachmentHeader.h"
#import "SentryEnvelopeItemHeader.h"
#import "SentryEnvelopeItemType.h"
#import "SentryEvent+Serialize.h"
#import "SentryEvent.h"
#import "SentryLogC.h"
#import "SentryMessage.h"
Expand Down
1 change: 1 addition & 0 deletions Sources/Sentry/SentryFileManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#import "SentryEnvelope.h"
#import "SentryEnvelopeItemHeader.h"
#import "SentryError.h"
#import "SentryEvent+Serialize.h"
#import "SentryEvent.h"
#import "SentryInternalDefines.h"
#import "SentryLogC.h"
Expand Down
1 change: 1 addition & 0 deletions Sources/Sentry/SentryTransaction.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#import "SentryTransaction.h"
#import "SentryEnvelopeItemType.h"
#import "SentryEvent+Serialize.h"
#import "SentryInternalDefines.h"
#import "SentryMeasurementValue.h"
#import "SentryNSDictionarySanitize.h"
Expand Down
8 changes: 8 additions & 0 deletions Sources/Sentry/include/SentryEvent+Serialize.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#if SDK_V9
# import "SentryEvent.h"
# import "SentrySerializable.h"

@interface SentryEvent () <SentrySerializable>

@end
#endif // SDK_V9
1 change: 1 addition & 0 deletions Sources/Sentry/include/SentryPrivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#import "SentryDateUtils.h"
#import "SentryDependencyContainerSwiftHelper.h"
#import "SentryDisplayLinkWrapper.h"
#import "SentryEvent+Serialize.h"
#import "SentryFileIOTracker.h"
#import "SentryFileManager.h"
#import "SentryLevelHelper.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import Foundation
fatalError("init() has not been implemented")
}

public override func serialize() -> [String: Any] {
@_implementationOnly public override func serialize() -> [String: Any] {
var result = super.serialize()
result["urls"] = urls
result["replay_start_timestamp"] = replayStartTimestamp.timeIntervalSince1970
Expand Down
7 changes: 0 additions & 7 deletions sdk_api_V9.json
Original file line number Diff line number Diff line change
Expand Up @@ -7174,7 +7174,6 @@
"objc_name": "init",
"declAttributes": [
"Override",
"Required",
"ObjC",
"Dynamic"
],
Expand Down Expand Up @@ -7252,12 +7251,6 @@
"ObjectiveC.NSObject"
],
"conformances": [
{
"kind": "Conformance",
"name": "SentrySerializable",
"printedName": "SentrySerializable",
"usr": "c:objc(pl)SentrySerializable"
},
{
"kind": "Conformance",
"name": "Copyable",
Expand Down
Loading