chore: Remove some deprecated properties for v9 (#6616)

* chore: Remove some deprecated properties for v9

* Fix test build

Author: noahsmartin

Sources/Sentry/Public/SentryDefines.h

@@ -152,20 +152,6 @@ typedef NSNumber *_Nullable (^SentryTracesSamplerCallback)(
 typedef NS_ENUM(NSUInteger,
     SentryLevel); // This is a forward declaration, the actual enum is implemented in Swift.
 
-/**
- * Static internal helper to convert enum to string.
- */
-static DEPRECATED_MSG_ATTRIBUTE(
-    "Use nameForSentryLevel() instead.") NSString *_Nonnull const SentryLevelNames[]
-    = {
-          @"none",
-          @"debug",
-          @"info",
-          @"warning",
-          @"error",
-          @"fatal",
-      };
-
 static NSUInteger const defaultMaxBreadcrumbs = 100;
 
 static NSString *_Nonnull const kSentryTrueString = @"true";

Sources/Sentry/Public/SentryScope.h

@@ -107,9 +107,6 @@ NS_SWIFT_NAME(Scope)
  */
 - (void)addBreadcrumb:(SentryBreadcrumb *)crumb NS_SWIFT_NAME(addBreadcrumb(_:));
 
-- (void)add:(SentryBreadcrumb *)crumb DEPRECATED_MSG_ATTRIBUTE("use `addBreadcrumb` instead")
-                NS_SWIFT_NAME(add(_:));
-
 /**
  * Clears all breadcrumbs in the scope
  */
@@ -139,11 +136,6 @@ NS_SWIFT_NAME(Scope)
  */
 - (void)addAttachment:(SentryAttachment *)attachment NS_SWIFT_NAME(addAttachment(_:));
 
-// We want to keep the old Swift `add(_ attachment:)` function as deprecated, but we cant have
-// another objc `add` method
-- (void)includeAttachment:(SentryAttachment *)attachment
-    DEPRECATED_MSG_ATTRIBUTE("use `addAttachment` instead")NS_SWIFT_NAME(add(_:));
-
 /**
  * Clears all attachments in the scope.
  */

Sources/Sentry/Public/SentrySpanStatus.h

@@ -96,13 +96,6 @@ typedef NS_ENUM(NSUInteger, SentrySpanStatus) {
     kSentrySpanStatusDataLoss,
 };
 
-static DEPRECATED_MSG_ATTRIBUTE(
-    "Use nameForSentrySpanStatus() instead.") NSString *_Nonnull const SentrySpanStatusNames[]
-    = { @"undefined", @"ok", @"deadline_exceeded", @"unauthenticated", @"permission_denied",
-          @"not_found", @"resource_exhausted", @"invalid_argument", @"unimplemented",
-          @"unavailable", @"internal_error", @"unknown_error", @"cancelled", @"already_exists",
-          @"failed_precondition", @"aborted", @"out_of_range", @"data_loss" };
-
 NS_ASSUME_NONNULL_BEGIN
 
 FOUNDATION_EXPORT NSString *const kSentrySpanStatusNameUndefined;

Sources/Swift/Integrations/SessionReplay/SentryReplayOptions.swift

@@ -162,22 +162,6 @@ public final class SentryReplayOptions: NSObject, SentryRedactOptions {
      */
     public var unmaskedViewClasses: [AnyClass]
 
-    /**
-     * Alias for ``enableViewRendererV2``.
-     *
-     * This flag is deprecated and will be removed in a future version.
-     * Please use ``enableViewRendererV2`` instead.
-     */
-    @available(*, deprecated, renamed: "enableViewRendererV2")
-    public var enableExperimentalViewRenderer: Bool {
-        get {
-            enableViewRendererV2
-        }
-        set {
-            enableViewRendererV2 = newValue
-        }
-    }
-
     /**
      * Enables the up to 5x faster new view renderer used by the Session Replay integration.
      *
@@ -316,8 +300,7 @@ public final class SentryReplayOptions: NSObject, SentryRedactOptions {
             onErrorSampleRate: (dictionary["errorSampleRate"] as? NSNumber)?.floatValue,
             maskAllText: (dictionary["maskAllText"] as? NSNumber)?.boolValue,
             maskAllImages: (dictionary["maskAllImages"] as? NSNumber)?.boolValue,
-            enableViewRendererV2: (dictionary["enableViewRendererV2"] as? NSNumber)?.boolValue
-            ?? (dictionary["enableExperimentalViewRenderer"] as? NSNumber)?.boolValue,
+            enableViewRendererV2: (dictionary["enableViewRendererV2"] as? NSNumber)?.boolValue,
             enableFastViewRendering: (dictionary["enableFastViewRendering"] as? NSNumber)?.boolValue,
             maskedViewClasses: (dictionary["maskedViewClasses"] as? NSArray)?.compactMap({ element in
                 NSClassFromString((element as? String) ?? "")

Sources/Swift/Protocol/Codable/SentryUserCodable.swift

@@ -2,7 +2,6 @@
 import Foundation
 
 final class UserDecodable: User {
-    @available(*, deprecated)
     convenience public init(from decoder: any Decoder) throws {
         try self.init(decodedFrom: decoder)
     }

Tests/SentryTests/Helper/SentryEnabledFeaturesBuilderTests.swift

@@ -54,24 +54,6 @@ final class SentryEnabledFeaturesBuilderTests: XCTestCase {
         XCTAssertEqual(result, [])
     }
 
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of the tested property.")
-    func testEnableExperimentalViewRenderer_isEnabled_shouldAddFeature() throws {
-#if os(iOS)
-        // -- Arrange --
-        let options = Options()
-
-        options.sessionReplay.enableExperimentalViewRenderer = true
-
-        // -- Act --
-        let features = SentryEnabledFeaturesBuilder.getEnabledFeatures(options: options)
-
-        // -- Assert --
-        XCTAssert(features.contains("experimentalViewRenderer"))
-#else
-        throw XCTSkip("Test not supported on this platform")
-#endif
-    }
-
     func testEnableViewRendererV2_isEnabled_shouldAddFeature() throws {
 #if os(iOS)
         // -- Arrange --

Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift

@@ -960,7 +960,6 @@ class SentryNetworkTrackerTests: XCTestCase {
         XCTAssertEqual(task.currentRequest?.allHTTPHeaderFields?["traceparent"] ?? "", "test")
     }
 
-    @available(*, deprecated)
     func testDefaultHeadersWhenDisabled() throws {
         let sut = fixture.getSut()
         sut.disable()
@@ -976,7 +975,6 @@ class SentryNetworkTrackerTests: XCTestCase {
         XCTAssertEqual(task.currentRequest?.allHTTPHeaderFields?["sentry-trace"] ?? "", expectedTraceHeader)
     }
 
-    @available(*, deprecated)
     func testDefaultHeadersWhenNoTransaction() {
         let sut = fixture.getSut()
         let task = createDataTask()

Tests/SentryTests/Integrations/SessionReplay/SentryReplayOptionsTests.swift

@@ -564,75 +564,6 @@ class SentryReplayOptionsTests: XCTestCase {
         // -- Assert --
         XCTAssertTrue(options.enableViewRendererV2)
     }
-    
-    func testInitFromDict_enableViewRendererV2_precedenceOverEnableExperimentalViewRenderer() {
-        // -- Act --
-        let options = SentryReplayOptions(dictionary: [
-            "enableViewRendererV2": false,
-            "enableExperimentalViewRenderer": true
-        ])
-
-        // -- Assert --
-        XCTAssertFalse(options.enableViewRendererV2)
-    }
-    
-    func testInitFromDict_enableExperimentalViewRenderer_whenValidValue_shouldSetValue() {
-        // To support backwards compatibility we keep support for the old key
-        // "experimentalViewRenderer" until we remove it in a future version.
-
-        // -- Act --
-        let options = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": true
-        ])
-
-        // -- Assert --
-        XCTAssertTrue(options.enableViewRendererV2)
-
-        let options2 = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": false
-        ])
-
-        // -- Assert --
-        XCTAssertTrue(options.enableViewRendererV2)
-        XCTAssertFalse(options2.enableViewRendererV2)
-    }
-
-    func testInitFromDict_enableExperimentalViewRenderer_whenInvalidValue_shouldUseDefaultValue() {
-        // To support backwards compatibility we keep support for the old key
-        // "experimentalViewRenderer" until we remove it in a future version.
-
-        // -- Act --
-        let options = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": "invalid_value"
-        ])
-
-        // -- Assert --
-        XCTAssertTrue(options.enableViewRendererV2)
-    }
-
-    func testInitFromDict_enableViewRendererV2WithBool_shouldIgnoreValue() {
-        // -- Act --
-        let options = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": true
-        ])
-        let options2 = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": false
-        ])
-
-        // -- Assert --
-        XCTAssertTrue(options.enableViewRendererV2)
-        XCTAssertFalse(options2.enableViewRendererV2)
-    }
-
-    func testInitFromDict_enableViewRendererV2WithString_shouldIgnoreValue() {
-        // -- Act --
-        let options = SentryReplayOptions(dictionary: [
-            "enableExperimentalViewRenderer": "invalid_value"
-        ])
-
-        // -- Assert --
-        XCTAssertTrue(options.enableViewRendererV2)
-    }
 
     func testInitFromDict_enableFastViewRendering_whenValidValue_shouldSetValue() {
         let options = SentryReplayOptions(dictionary: [
@@ -705,28 +636,6 @@ class SentryReplayOptionsTests: XCTestCase {
         XCTAssertEqual(options.quality, .low)
     }
 
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of the tested property.")
-    func testExperimentalViewRenderer_shouldBeAnAliasForEnableViewRendererV2() {
-        // -- Arrange --
-        let options = SentryReplayOptions()
-        options.enableViewRendererV2 = false
-        options.enableExperimentalViewRenderer = false
-
-        // -- Act & Assert --
-        XCTAssertFalse(options.enableViewRendererV2)
-        XCTAssertFalse(options.enableExperimentalViewRenderer)
-
-        options.enableViewRendererV2 = true
-        
-        XCTAssertTrue(options.enableViewRendererV2)
-        XCTAssertTrue(options.enableExperimentalViewRenderer)
-
-        options.enableExperimentalViewRenderer = false
-
-        XCTAssertFalse(options.enableViewRendererV2)
-        XCTAssertFalse(options.enableExperimentalViewRenderer)
-    }
-
     // MARK: frameRate
 
     func testInitFromDict_frameRate_whenValidValue_shouldSetValue() {

Tests/SentryTests/Protocol/SentryUserTests.swift

@@ -1,7 +1,6 @@
 @_spi(Private) @testable import Sentry
 import XCTest
 
-@available(*, deprecated)
 class SentryUserTests: XCTestCase {
 
     func testInitWithDictionary() {

Tests/SentryTests/SentryScopeSwiftTests.swift

@@ -24,7 +24,6 @@ class SentryScopeSwiftTests: XCTestCase {
         let transactionOperation = "Some Operation"
         let maxBreadcrumbs = 5
 
-        @available(*, deprecated)
         init() {
             date = Date(timeIntervalSince1970: 10)
 
@@ -81,7 +80,6 @@ class SentryScopeSwiftTests: XCTestCase {
 
     private var fixture: Fixture!
 
-    @available(*, deprecated)
     override func setUp() {
         super.setUp()
         fixture = Fixture()