Remove deprecated in V9

noahsmartin · noahsmartin · commit 65d90690d95a · 2025-07-08T17:49:27.000-04:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,6 +98,13 @@ jobs:
       - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace && EXPERIMENTAL_SPM_BUILDS=1 xcodebuild build -scheme SentrySPM -sdk watchos -destination 'generic/platform=watchOS'
         shell: sh
 
+  build-v9:
+    name: Build SDK v9
+    runs-on: macos-15
+    steps:
+      - uses: actions/checkout@v4
+      - run: ./scripts/sentry-xcodebuild.sh --platform iOS --os latest --device "iPhone 16" --command build --configuration DebugV9
+
   check-debug-without-UIKit:
     name: Check no UIKit linkage (DebugWithoutUIKit)
     runs-on: macos-13
diff --git a/Sources/Configuration/DeploymentTargets.xcconfig b/Sources/Configuration/DeploymentTargets.xcconfig
@@ -19,5 +19,10 @@ WATCHOS_DEPLOYMENT_TARGET = $(WATCHOS_DEPLOYMENT_TARGET_V$(MAJOR_VERSION))
 TVOS_DEPLOYMENT_TARGET = $(TVOS_DEPLOYMENT_TARGET_V$(MAJOR_VERSION))
 XROS_DEPLOYMENT_TARGET = 1.0
 
-GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) SDK_V$(MAJOR_VERSION)
-SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS) SDK_V$(MAJOR_VERSION)
+GCC_PREPROCESSOR_DEFINITIONS_V9 = $(GCC_PREPROCESSOR_DEFINITIONS) SDK_V$(MAJOR_VERSION)
+GCC_PREPROCESSOR_DEFINITIONS_V = $(GCC_PREPROCESSOR_DEFINITIONS)
+GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS_V$(MAJOR_VERSION))
+
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_V9 = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS) SDK_V$(MAJOR_VERSION)
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_V = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS)
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS_V$(MAJOR_VERSION))
diff --git a/Sources/Configuration/Sentry.xcconfig b/Sources/Configuration/Sentry.xcconfig
@@ -10,6 +10,7 @@ SENTRY_WITHOUT_UIKIT_MODULE_NAME = SentryWithoutUIKit
 HEADER_SEARCH_PATHS = $(SRCROOT)/Sources/Sentry/include/**
 
 PRODUCT_MODULE_NAME_Debug = $(SENTRY_MODULE_NAME)
+PRODUCT_MODULE_NAME_DebugV9 = $(SENTRY_MODULE_NAME)
 PRODUCT_MODULE_NAME_DebugWithoutUIKit = $(SENTRY_WITHOUT_UIKIT_MODULE_NAME)
 PRODUCT_MODULE_NAME_Test = $(SENTRY_MODULE_NAME)
 PRODUCT_MODULE_NAME_TestCI = $(SENTRY_MODULE_NAME)
diff --git a/Sources/Sentry/Public/SentryClient.h b/Sources/Sentry/Public/SentryClient.h
@@ -95,6 +95,7 @@ SENTRY_NO_INIT
 - (SentryId *)captureMessage:(NSString *)message
                    withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(message:scope:));
 
+#if !SDK_V9
 /**
  * Captures a manually created user feedback and sends it to Sentry.
  * @param userFeedback The user feedback to send to Sentry.
@@ -103,6 +104,7 @@ SENTRY_NO_INIT
 - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
     NS_SWIFT_NAME(capture(userFeedback:))
         DEPRECATED_MSG_ATTRIBUTE("Use -[SentryClient captureFeedback:withScope:].");
+#endif // !SDK_V9
 
 /**
  * Captures a new-style user feedback and sends it to Sentry.
diff --git a/Sources/Sentry/Public/SentryDefines.h b/Sources/Sentry/Public/SentryDefines.h
@@ -160,7 +160,7 @@ typedef NS_ENUM(NSInteger, SentryLogLevel) {
     kSentryLogLevelDebug,
     kSentryLogLevelVerbose
 };
-#endif
+#endif // !SDK_V9
 
 /**
  * Sentry level.
diff --git a/Sources/Sentry/Public/SentryDsn.h b/Sources/Sentry/Public/SentryDsn.h
@@ -11,7 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)getHash;
 
-- (NSURL *)getStoreEndpoint;
+#if !SDK_v9
+- (NSURL *)getStoreEndpoint DEPRECATED_MSG_ATTRIBUTE("This endpoint is no longer used");
+#endif // !SDK_V9
 - (NSURL *)getEnvelopeEndpoint;
 
 @end
diff --git a/Sources/Sentry/Public/SentryHub.h b/Sources/Sentry/Public/SentryHub.h
@@ -173,13 +173,15 @@ SENTRY_NO_INIT
 - (SentryId *)captureMessage:(NSString *)message
                    withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(message:scope:));
 
+#if !SDK_V9
 /**
  * Captures a manually created user feedback and sends it to Sentry.
  * @param userFeedback The user feedback to send to Sentry.
  * @deprecated Use @c -[SentryHub @c captureFeedback:] .
  */
 - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback NS_SWIFT_NAME(capture(userFeedback:))
                                 DEPRECATED_MSG_ATTRIBUTE("Use -[SentryHub captureFeedback:].");
+#endif // !SDK_V9
 
 /**
  * Captures a new-style user feedback and sends it to Sentry.
diff --git a/Sources/Sentry/Public/SentrySDK.h b/Sources/Sentry/Public/SentrySDK.h
@@ -253,6 +253,7 @@ SENTRY_NO_INIT
               withScopeBlock:(void (^)(SentryScope *scope))block
     NS_SWIFT_NAME(capture(message:block:));
 
+#if !SDK_V9
 /**
  * Captures user feedback that was manually gathered and sends it to Sentry.
  * @param userFeedback The user feedback to send to Sentry.
@@ -263,6 +264,7 @@ SENTRY_NO_INIT
     NS_SWIFT_NAME(capture(userFeedback:)) DEPRECATED_MSG_ATTRIBUTE(
         "Use SentrySDK.captureFeedback or use or configure our new managed UX with "
         "SentryOptions.configureUserFeedback.");
+#endif // !SDK_V9
 
 /**
  * Captures user feedback that was manually gathered and sends it to Sentry.
diff --git a/Sources/Sentry/Public/SentryScope.h b/Sources/Sentry/Public/SentryScope.h
@@ -154,6 +154,7 @@ NS_SWIFT_NAME(Scope)
  */
 - (void)clear;
 
+#if !SDK_V9
 /**
  * Mutates the current transaction atomically.
  * @param callback the SentrySpanCallback.
@@ -163,6 +164,7 @@ NS_SWIFT_NAME(Scope)
         "This method was used to create an atomic block that could be used to mutate the current "
         "span. It is not atomic anymore and due to issues with memory safety in `NSBlock` it is "
         "now considered unsafe and deprecated. Use `span` instead.");
+#endif // !SDK_V9
 
 /**
  * Returns the current span.
diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -575,6 +575,7 @@ - (void)captureEnvelope:(SentryEnvelope *)envelope
     [self.transportAdapter sendEnvelope:envelope];
 }
 
+#if !SDK_V9
 - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
 {
     if ([self isDisabled]) {
@@ -589,6 +590,7 @@ - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
 
     [self.transportAdapter sendUserFeedback:userFeedback];
 }
+#endif // !SDK_V9
 
 - (void)captureFeedback:(SentryFeedback *)feedback withScope:(SentryScope *)scope
 {
diff --git a/Sources/Sentry/SentryDataCategoryMapper.m b/Sources/Sentry/SentryDataCategoryMapper.m
@@ -11,7 +11,9 @@
 NSString *const kSentryDataCategoryNameSession = @"session";
 NSString *const kSentryDataCategoryNameTransaction = @"transaction";
 NSString *const kSentryDataCategoryNameAttachment = @"attachment";
+#if !SDK_V9
 NSString *const kSentryDataCategoryNameUserFeedback = @"user_report";
+#endif // !SSDK_v9
 NSString *const kSentryDataCategoryNameProfile = @"profile";
 NSString *const kSentryDataCategoryNameProfileChunk = @"profile_chunk_ui";
 NSString *const kSentryDataCategoryNameReplay = @"replay";
@@ -89,9 +91,11 @@
     if ([value isEqualToString:kSentryDataCategoryNameAttachment]) {
         return kSentryDataCategoryAttachment;
     }
+#if !SDK_V9
     if ([value isEqualToString:kSentryDataCategoryNameUserFeedback]) {
         return kSentryDataCategoryUserFeedback;
     }
+#endif // !SDK_V9
     if ([value isEqualToString:kSentryDataCategoryNameProfile]) {
         return kSentryDataCategoryProfile;
     }
@@ -131,8 +135,10 @@
         return kSentryDataCategoryNameTransaction;
     case kSentryDataCategoryAttachment:
         return kSentryDataCategoryNameAttachment;
+#if !SDK_V9
     case kSentryDataCategoryUserFeedback:
         return kSentryDataCategoryNameUserFeedback;
+#endif // !SDK_V9
     case kSentryDataCategoryProfile:
         return kSentryDataCategoryNameProfile;
     case kSentryDataCategoryProfileChunk:
diff --git a/Sources/Sentry/SentryDsn.m b/Sources/Sentry/SentryDsn.m
@@ -39,6 +39,7 @@ - (NSString *)getHash
     return output;
 }
 
+#if !SDK_v9
 - (NSURL *)getStoreEndpoint
 {
     if (nil == _storeEndpoint) {
@@ -50,6 +51,7 @@ - (NSURL *)getStoreEndpoint
     }
     return _storeEndpoint;
 }
+#endif // !SDK_v9
 
 - (NSURL *)getEnvelopeEndpoint
 {
diff --git a/Sources/Sentry/SentryEnvelope.m b/Sources/Sentry/SentryEnvelope.m
@@ -111,6 +111,7 @@ - (instancetype)initWithSession:(SentrySession *)session
                   data:json];
 }
 
+#if !SDK_V9
 - (instancetype)initWithUserFeedback:(SentryUserFeedback *)userFeedback
 {
     NSError *error = nil;
@@ -128,6 +129,7 @@ - (instancetype)initWithUserFeedback:(SentryUserFeedback *)userFeedback
                                           length:json.length]
                            data:json];
 }
+#endif // !SDK_V9
 
 - (instancetype)initWithClientReport:(SentryClientReport *)clientReport
 {
@@ -284,13 +286,15 @@ - (instancetype)initWithEvent:(SentryEvent *)event
                      singleItem:item];
 }
 
+#if !SDK_V9
 - (instancetype)initWithUserFeedback:(SentryUserFeedback *)userFeedback
 {
     SentryEnvelopeItem *item = [[SentryEnvelopeItem alloc] initWithUserFeedback:userFeedback];
 
     return [self initWithHeader:[[SentryEnvelopeHeader alloc] initWithId:userFeedback.eventId]
                      singleItem:item];
 }
+#endif // !SDK_V9
 
 - (instancetype)initWithId:(SentryId *_Nullable)id singleItem:(SentryEnvelopeItem *)item
 {
diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -540,13 +540,15 @@ - (SentryId *)captureException:(NSException *)exception withScope:(SentryScope *
     return SentryId.empty;
 }
 
+#if !SDK_V9
 - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
 {
     SentryClient *client = self.client;
     if (client != nil) {
         [client captureUserFeedback:userFeedback];
     }
 }
+#endif // !SDK_V9
 
 - (void)captureFeedback:(SentryFeedback *)feedback
 {
diff --git a/Sources/Sentry/SentrySDK.m b/Sources/Sentry/SentrySDK.m
@@ -442,10 +442,12 @@ + (void)storeEnvelope:(SentryEnvelope *)envelope
     [SentrySDK.currentHub storeEnvelope:envelope];
 }
 
+#if !SDK_V9
 + (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
 {
     [SentrySDK.currentHub captureUserFeedback:userFeedback];
 }
+#endif // !SDK_V9
 
 + (void)captureFeedback:(SentryFeedback *)feedback
 {
diff --git a/Sources/Sentry/SentryTransportAdapter.m b/Sources/Sentry/SentryTransportAdapter.m
@@ -91,8 +91,9 @@ - (void)storeEvent:(SentryEvent *)event traceContext:(nullable SentryTraceContex
     }
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#if !SDK_V9
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)sendUserFeedback:(SentryUserFeedback *)userFeedback
 {
     SentryEnvelopeItem *item = [[SentryEnvelopeItem alloc] initWithUserFeedback:userFeedback];
@@ -102,7 +103,8 @@ - (void)sendUserFeedback:(SentryUserFeedback *)userFeedback
                                                            singleItem:item];
     [self sendEnvelope:envelope];
 }
-#pragma clang diagnostic pop
+#    pragma clang diagnostic pop
+#endif // !SDK_V9
 
 - (void)sendEnvelope:(SentryEnvelope *)envelope
 {
diff --git a/Sources/Sentry/include/HybridPublic/SentryEnvelope.h b/Sources/Sentry/include/HybridPublic/SentryEnvelope.h
@@ -91,6 +91,8 @@ SENTRY_NO_INIT
 
 - (instancetype)initWithEvent:(SentryEvent *)event;
 - (instancetype)initWithSession:(SentrySession *)session;
+
+#if !SDK_V9
 /**
  * @deprecated Building the envelopes for the new @c SentryFeedback type is done directly in @c
  * -[SentryClient @c captureFeedback:withScope:]
@@ -100,6 +102,7 @@ SENTRY_NO_INIT
         "Building the envelopes for the new SentryFeedback type is done directly in -[SentryClient "
         "captureFeedback:withScope:] so there will be no analog to this initializer for "
         "SentryFeedback at this time..");
+#endif // !SDK_V9
 - (_Nullable instancetype)initWithAttachment:(SentryAttachment *)attachment
                            maxAttachmentSize:(NSUInteger)maxAttachmentSize;
 - (instancetype)initWithHeader:(SentryEnvelopeItemHeader *)header
@@ -149,13 +152,15 @@ SENTRY_NO_INIT
  */
 - (instancetype)initWithEvent:(SentryEvent *)event;
 
+#if !SDK_V9
 /**
  * @deprecated Building the envelopes for the new @c SentryFeedback type is done directly in @c
  * -[SentryClient @c captureFeedback:withScope:]
  */
 - (instancetype)initWithUserFeedback:(SentryUserFeedback *)userFeedback
     DEPRECATED_MSG_ATTRIBUTE("Building the envelopes for the new SentryFeedback type is done "
                              "directly in -[SentryClient captureFeedback:withScope:].");
+#endif // !SDK_V9
 
 /**
  * The envelope header.
diff --git a/Sources/Sentry/include/HybridPublic/SentryEnvelopeItemType.h b/Sources/Sentry/include/HybridPublic/SentryEnvelopeItemType.h
@@ -5,7 +5,9 @@
 // differences.
 static NSString *const SentryEnvelopeItemTypeEvent = @"event";
 static NSString *const SentryEnvelopeItemTypeSession = @"session";
+#if !SDK_V9
 static NSString *const SentryEnvelopeItemTypeUserFeedback = @"user_report";
+#endif // !SDK_V9
 static NSString *const SentryEnvelopeItemTypeFeedback = @"feedback";
 static NSString *const SentryEnvelopeItemTypeTransaction = @"transaction";
 static NSString *const SentryEnvelopeItemTypeAttachment = @"attachment";
diff --git a/Sources/Sentry/include/SentryTransportAdapter.h b/Sources/Sentry/include/SentryTransportAdapter.h
@@ -48,12 +48,14 @@ SENTRY_NO_INIT
 
 - (void)storeEvent:(SentryEvent *)event traceContext:(nullable SentryTraceContext *)traceContext;
 
+#if !SDK_V9
 /**
  * @deprecated Use @c -[SentryClient @c captureFeedback:withScope:] .
  */
 - (void)sendUserFeedback:(SentryUserFeedback *)userFeedback
     NS_SWIFT_NAME(send(userFeedback:))
         DEPRECATED_MSG_ATTRIBUTE("Use -[SentryClient captureFeedback:withScope:].");
+#endif // !SDK_V9
 
 - (void)sendEnvelope:(SentryEnvelope *)envelope NS_SWIFT_NAME(send(envelope:));
 
diff --git a/Sources/Swift/Integrations/UserFeedback/SentryUserFeedback.swift b/Sources/Swift/Integrations/UserFeedback/SentryUserFeedback.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+#if !SDK_V9
 /// Adds additional information about what happened to an event.
 /// @deprecated Use `SentryFeedback`.
 @objc(SentryUserFeedback)
@@ -36,4 +37,5 @@ open class UserFeedback: NSObject, SentrySerializable {
             "comments": comments
         ]
     }
-} 
+}
+#endif // !SDK_V9
diff --git a/Tests/SentryTests/Networking/SentryDsnTests.m b/Tests/SentryTests/Networking/SentryDsnTests.m
@@ -47,6 +47,8 @@ - (void)testUnsupportedProtocol
     XCTAssertNil(options);
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)testDsnUrl
 {
     NSError *error = nil;
@@ -65,6 +67,7 @@ - (void)testDsnUrl
         [[dsn2 getStoreEndpoint] absoluteString], @"https://sentry.io/foo/bar/baz/api/1/store/");
     XCTAssertNil(error);
 }
+#pragma clang diagnostic pop
 
 - (void)testGetEnvelopeUrl
 {
@@ -85,6 +88,8 @@ - (void)testGetEnvelopeUrl
     XCTAssertNil(error);
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)testGetStoreDsnCachesResult
 {
     SentryDsn *dsn = [[SentryDsn alloc] initWithString:@"https://username:password@getsentry.net/1"
@@ -94,6 +99,7 @@ - (void)testGetStoreDsnCachesResult
     // Assert same reference
     XCTAssertTrue([dsn getStoreEndpoint] == [dsn getStoreEndpoint]);
 }
+#pragma clang diagnostic pop
 
 - (void)testInitWithInvalidString
 {
diff --git a/sdk_api.json b/sdk_api.json
@@ -25465,10 +25465,12 @@
             "declKind": "Func",
             "usr": "c:objc(cs)SentryDsn(im)getStoreEndpoint",
             "moduleName": "Sentry",
+            "deprecated": true,
             "isOpen": true,
             "objc_name": "getStoreEndpoint",
             "declAttributes": [
               "DiscardableResult",
+              "Available",
               "ObjC",
               "Dynamic"
             ],

Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,7 @@ - (void)captureEnvelope:(SentryEnvelope *)envelope`
`575`	`575`	`[self.transportAdapter sendEnvelope:envelope];`
`576`	`576`	`}`
`577`	`577`
	`578`	`+#if !SDK_V9`
`578`	`579`	`- (void)captureUserFeedback:(SentryUserFeedback *)userFeedback`
`579`	`580`	`{`
`580`	`581`	`if ([self isDisabled]) {`
`@@ -589,6 +590,7 @@ - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback`
`589`	`590`
`590`	`591`	`[self.transportAdapter sendUserFeedback:userFeedback];`
`591`	`592`	`}`
	`593`	`+#endif // !SDK_V9`
`592`	`594`
`593`	`595`	`- (void)captureFeedback:(SentryFeedback )feedback withScope:(SentryScope )scope`
`594`	`596`	`{`