chore: Some decodable updates for V9

CHANGELOG-v9.md

@@ -9,7 +9,6 @@ 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, #5840, #5982)
-Removes Decodable conformances from the public API of model classes (#5691)
 Removes enableTracing property from SentryOptions (#5694)
 Removes deprecated `setExtraValue` from SentrySpan (#5864)
 Removes `integrations` property from `SentryOptions` (#5749)

CHANGELOG.md

@@ -4,8 +4,9 @@
 
 ### Breaking Changes
 
-Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
-Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
+- Removes Decodable conformances from the public API of model classes (#5691)
+- Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
+- Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
 
 ### Features
 

Sources/Sentry/SentryUser.m

@@ -122,7 +122,7 @@ - (BOOL)isEqual:(id _Nullable)other
     if (other == self) {
         return YES;
     }
-    if (!other || ![[other class] isEqual:[self class]]) {
+    if (!other || ![other isKindOfClass:[SentryUser class]]) {
         return NO;
     }
 

Sources/Swift/Protocol/Codable/SentryUserCodable.swift

@@ -1,16 +1,13 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class UserDecodable: User {
     @available(*, deprecated)
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias UserDecodable = User
-#endif
+
 extension UserDecodable: Decodable {
 
     enum CodingKeys: String, CodingKey {
@@ -24,13 +21,6 @@ extension UserDecodable: Decodable {
         case data
     }
 
-    #if !SDK_V9
-    @available(*, deprecated)
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
-
      @available(*, deprecated, message: """
      This method is only deprecated to silence the deprecation warning of the property \
      segment. Our Xcode project has deprecations as warnings and warnings as errors \

Tests/SentryTests/Persistence/SentryScopePersistentStoreTests.swift

@@ -262,7 +262,7 @@ class SentryScopePersistentStoreTests: XCTestCase {
         XCTAssertTrue(fm.fileExists(atPath: userFileURL.path))
 
         let writtenData = try Data(contentsOf: userFileURL)
-        let decodedUser = try JSONDecoder().decode(User.self, from: writtenData)
+        let decodedUser = try JSONDecoder().decode(UserDecodable.self, from: writtenData)
 
         XCTAssertEqual(decodedUser.userId, "test-user")
         XCTAssertEqual(decodedUser.email, "[email protected]")

Tests/SentryTests/Protocol/SentryUserTests.swift

@@ -81,7 +81,7 @@ class SentryUserTests: XCTestCase {
         let data = try XCTUnwrap(SentrySerializationSwift.data(withJSONObject: actual))
 
         // Act
-        let decoded = decodeFromJSONData(jsonData: data) as User?
+        let decoded = decodeFromJSONData(jsonData: data) as UserDecodable?
 
         // Assert
         XCTAssertEqual(user, decoded)
@@ -94,7 +94,7 @@ class SentryUserTests: XCTestCase {
         let data = try XCTUnwrap(SentrySerializationSwift.data(withJSONObject: actual))
 
         // Act
-        let decoded = decodeFromJSONData(jsonData: data) as User?
+        let decoded = decodeFromJSONData(jsonData: data) as UserDecodable?
 
         // Assert
         XCTAssertEqual(user, decoded)