chore: Remove more codable v9 checks (#6363)

Author: noahsmartin

Sources/Sentry/Public/SentryThread.h

@@ -20,19 +20,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 SENTRY_NO_INIT
 
-#if SDK_V9
 /**
  * Number of the thread.
  *
  * Can be nil for threads in recrash reports where the thread index information is not available.
  */
 @property (nullable, nonatomic, copy) NSNumber *threadId;
-#else
-/**
- * Number of the thread
- */
-@property (nonatomic, copy) NSNumber *threadId;
-#endif // SDK_V9
 
 /**
  * Name (if available) of the thread
@@ -59,21 +52,12 @@ SENTRY_NO_INIT
  */
 @property (nullable, nonatomic, copy) NSNumber *isMain;
 
-#if SDK_V9
 /**
  * Initializes a SentryThread with its id
  * @param threadId NSNumber or nil if thread index is not available (e.g., recrash reports)
  * @return SentryThread
  */
 - (instancetype)initWithThreadId:(nullable NSNumber *)threadId;
-#else
-/**
- * Initializes a SentryThread with its id
- * @param threadId NSNumber
- * @return SentryThread
- */
-- (instancetype)initWithThreadId:(NSNumber *)threadId;
-#endif // SDK_V9
 
 @end
 

Sources/Sentry/SentryBreadcrumb.m

@@ -77,7 +77,7 @@ - (BOOL)isEqual:(id _Nullable)other
 {
     if (other == self)
         return YES;
-    if (!other || ![[other class] isEqual:[self class]])
+    if (!other || ![other isKindOfClass:[SentryBreadcrumb class]])
         return NO;
 
     return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];

Sources/Sentry/SentryGeo.m

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

Sources/Sentry/SentryThread.mm

@@ -12,11 +12,7 @@
 
 @implementation SentryThread
 
-#if SDK_V9
 - (instancetype)initWithThreadId:(nullable NSNumber *)threadId
-#else
-- (instancetype)initWithThreadId:(NSNumber *)threadId
-#endif // SDK_V9
 {
     self = [super init];
     if (self) {

Sources/Swift/Protocol/Codable/SentryBreadcrumbCodable.swift

@@ -1,15 +1,12 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class BreadcrumbDecodable: Breadcrumb {
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias BreadcrumbDecodable = Breadcrumb
-#endif
+
 extension BreadcrumbDecodable: Decodable {
 
     private enum CodingKeys: String, CodingKey {
@@ -21,12 +18,6 @@ extension BreadcrumbDecodable: Decodable {
         case data
         case origin
     }
-    
-    #if !SDK_V9
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
 
     private convenience init(decodedFrom decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)

Sources/Swift/Protocol/Codable/SentryEventCodable.swift

@@ -16,24 +16,13 @@ import Foundation
  * overridden. Therefore, we add the Decodable implementation not on the Event, but to a subclass of
  * the event.
  */
-#if !SDK_V9
-@objc(SentryEventDecodable)
-open class SentryEventDecodable: Event, Decodable {
-    required convenience public init(from decoder: any Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.init()
-        try writePropertiesFrom(container: container)
-    }
-}
-#else
 final class SentryEventDecodable: Event, Decodable {
     required convenience public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.init()
         try writePropertiesFrom(container: container)
     }
 }
-#endif
 
 extension SentryEventDecodable {
     private enum CodingKeys: String, CodingKey {

Sources/Swift/Protocol/Codable/SentryExceptionCodable.swift

@@ -1,15 +1,12 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class ExceptionDecodable: Exception {
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias ExceptionDecodable = Exception
-#endif
+
 extension ExceptionDecodable: Decodable {
 
     private enum CodingKeys: String, CodingKey {
@@ -21,12 +18,6 @@ extension ExceptionDecodable: Decodable {
         case stacktrace   
     }
 
-    #if !SDK_V9
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
-
     private convenience init(decodedFrom decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 

Sources/Swift/Protocol/Codable/SentryFrameCodable.swift

@@ -1,15 +1,12 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class FrameDecodable: Frame {
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias FrameDecodable = Frame
-#endif
+
 extension FrameDecodable: Decodable {
 
     enum CodingKeys: String, CodingKey {
@@ -35,12 +32,6 @@ extension FrameDecodable: Decodable {
         case stackStart = "stack_start"
     }
 
-    #if !SDK_V9
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
-
     private convenience init(decodedFrom decoder: Decoder) throws {
         self.init()
 

Sources/Swift/Protocol/Codable/SentryGeoCodable.swift

@@ -1,28 +1,19 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class GeoDecodable: Geo {
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias GeoDecodable = Geo
-#endif
+
 extension GeoDecodable: Decodable {
 
     private enum CodingKeys: String, CodingKey {
         case city
         case countryCode = "country_code"
         case region
     }
-    
-    #if !SDK_V9
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
 
     private convenience init(decodedFrom decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)

Sources/Swift/Protocol/Codable/SentryMechanismCodable.swift

@@ -1,15 +1,12 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
-#if SDK_V9
 final class MechanismDecodable: Mechanism {
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }
 }
-#else
-typealias MechanismDecodable = Mechanism
-#endif
+
 extension MechanismDecodable: Decodable {
 
     enum CodingKeys: String, CodingKey {
@@ -21,12 +18,6 @@ extension MechanismDecodable: Decodable {
         case helpLink = "help_link"
         case meta
     }
-    
-    #if !SDK_V9
-    required convenience public init(from decoder: any Decoder) throws {
-        try self.init(decodedFrom: decoder)
-    }
-    #endif
 
     private convenience init(decodedFrom decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)