Chore: Swift Sentry Integration (#3733)

brustolin · web-flow · commit 2de284cc0140 · 2024-03-14T14:06:45.000+01:00
Moved SentryIntegrationProtocol to swift and fixed some headers references in order to be able to write new integrations in Swift.

Required for Session Replay
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -604,7 +604,6 @@
 		7DB3A687238EA75E00A2D442 /* SentryHttpTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DB3A684238EA75E00A2D442 /* SentryHttpTransport.m */; };
 		7DC27EC523997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DC27EC323997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.h */; };
 		7DC27EC723997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC27EC423997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.m */; };
-		7DC83100239826280043DD9A /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7DC8310A2398283C0043DD9A /* SentryCrashIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DC831082398283C0043DD9A /* SentryCrashIntegration.h */; };
 		7DC8310C2398283C0043DD9A /* SentryCrashIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC831092398283C0043DD9A /* SentryCrashIntegration.m */; };
 		840A11122B61E27500650D02 /* SentrySamplerDecision.m in Sources */ = {isa = PBXBuildFile; fileRef = 840A11102B61E27500650D02 /* SentrySamplerDecision.m */; };
@@ -827,6 +826,7 @@
 		D8C66A372A77B1F70015696A /* SentryPropagationContext.m in Sources */ = {isa = PBXBuildFile; fileRef = D8C66A352A77B1F70015696A /* SentryPropagationContext.m */; };
 		D8C67E9B28000E24007E326E /* SentryUIApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = D8C67E9928000E23007E326E /* SentryUIApplication.h */; };
 		D8C67E9C28000E24007E326E /* SentryScreenshot.h in Headers */ = {isa = PBXBuildFile; fileRef = D8C67E9A28000E23007E326E /* SentryScreenshot.h */; };
+		D8CAC0412BA0984500E38F34 /* SentryIntegrationProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8CAC0402BA0984500E38F34 /* SentryIntegrationProtocol.swift */; };
 		D8CB74152947246600A5F964 /* SentryEnvelopeAttachmentHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = D8CB74142947246600A5F964 /* SentryEnvelopeAttachmentHeader.h */; };
 		D8CB7417294724CC00A5F964 /* SentryEnvelopeAttachmentHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D8CB7416294724CC00A5F964 /* SentryEnvelopeAttachmentHeader.m */; };
 		D8CB74192947285A00A5F964 /* SentryEnvelopeItemHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = D8CB74182947285A00A5F964 /* SentryEnvelopeItemHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1550,7 +1550,6 @@
 		7DC27E9823995F97006998B5 /* Sentry.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = Sentry.modulemap; path = ../Resources/Sentry.modulemap; sourceTree = "<group>"; };
 		7DC27EC323997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryAutoBreadcrumbTrackingIntegration.h; path = include/SentryAutoBreadcrumbTrackingIntegration.h; sourceTree = "<group>"; };
 		7DC27EC423997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAutoBreadcrumbTrackingIntegration.m; sourceTree = "<group>"; };
-		7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
 		7DC831082398283C0043DD9A /* SentryCrashIntegration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryCrashIntegration.h; path = include/SentryCrashIntegration.h; sourceTree = "<group>"; };
 		7DC831092398283C0043DD9A /* SentryCrashIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashIntegration.m; sourceTree = "<group>"; };
 		840A11092B5F47F700650D02 /* SentryAppLaunchProfilingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAppLaunchProfilingTests.m; sourceTree = "<group>"; };
@@ -1800,6 +1799,7 @@
 		D8C66A352A77B1F70015696A /* SentryPropagationContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryPropagationContext.m; sourceTree = "<group>"; };
 		D8C67E9928000E23007E326E /* SentryUIApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryUIApplication.h; path = include/SentryUIApplication.h; sourceTree = "<group>"; };
 		D8C67E9A28000E23007E326E /* SentryScreenshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryScreenshot.h; path = include/SentryScreenshot.h; sourceTree = "<group>"; };
+		D8CAC0402BA0984500E38F34 /* SentryIntegrationProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryIntegrationProtocol.swift; sourceTree = "<group>"; };
 		D8CB74142947246600A5F964 /* SentryEnvelopeAttachmentHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryEnvelopeAttachmentHeader.h; path = include/SentryEnvelopeAttachmentHeader.h; sourceTree = "<group>"; };
 		D8CB7416294724CC00A5F964 /* SentryEnvelopeAttachmentHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryEnvelopeAttachmentHeader.m; sourceTree = "<group>"; };
 		D8CB74182947285A00A5F964 /* SentryEnvelopeItemHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryEnvelopeItemHeader.h; path = Public/SentryEnvelopeItemHeader.h; sourceTree = "<group>"; };
@@ -2005,7 +2005,6 @@
 				6360850B1ED2AFE100E8599E /* SentryBreadcrumb.h */,
 				6360850C1ED2AFE100E8599E /* SentryBreadcrumb.m */,
 				92672BB529C9A2A9006B021C /* SentryBreadcrumb+Private.h */,
-				7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */,
 				7B4E24FB251C97B400060D68 /* SentrySession.h */,
 				15E0A8F12411A45A00F044E3 /* SentrySession.m */,
 				7BE1E32624F7AE08009D3AD0 /* SentrySession+Private.h */,
@@ -3519,6 +3518,7 @@
 			isa = PBXGroup;
 			children = (
 				D8F016B22B9622D6007B9AFB /* SentryId.swift */,
+				D8CAC0402BA0984500E38F34 /* SentryIntegrationProtocol.swift */,
 			);
 			path = Protocol;
 			sourceTree = "<group>";
@@ -3813,7 +3813,6 @@
 				7BC5B6FA290BCDE500D99477 /* SentryHttpStatusCodeRange+Private.h in Headers */,
 				7B04A9AF24EAC02C00E710B1 /* SentryRetryAfterHeaderParser.h in Headers */,
 				9286059529A5096600F96038 /* SentryGeo.h in Headers */,
-				7DC83100239826280043DD9A /* SentryIntegrationProtocol.h in Headers */,
 				7B98D7BC25FB607300C5A389 /* SentryWatchdogTerminationTracker.h in Headers */,
 				7BA61CB9247BC57B00C130A8 /* SentryCrashDefaultBinaryImageProvider.h in Headers */,
 				8E4E7C7D25DAB287006AB9E2 /* SentryTracer.h in Headers */,
@@ -4301,6 +4300,7 @@
 				7B14089824878F950035403D /* SentryCrashStackEntryMapper.m in Sources */,
 				63FE711720DA4C1000CDBAE8 /* SentryCrashStackCursor_Backtrace.c in Sources */,
 				63FE70CB20DA4C1000CDBAE8 /* SentryCrashReportFixer.c in Sources */,
+				D8CAC0412BA0984500E38F34 /* SentryIntegrationProtocol.swift in Sources */,
 				63FE710F20DA4C1000CDBAE8 /* NSError+SentrySimpleConstructor.m in Sources */,
 				8ECC674925C23A20000E2BF6 /* SentrySpanId.m in Sources */,
 				6344DDB51EC309E000D9160D /* SentryCrashReportSink.m in Sources */,
@@ -4908,6 +4908,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
@@ -4943,6 +4944,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
@@ -5085,6 +5087,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
@@ -5224,6 +5227,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
@@ -5712,6 +5716,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
@@ -5952,6 +5957,7 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h";
+				SWIFT_OBJC_INTEROP_MODE = objc;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
diff --git a/Sources/Sentry/PrivateSentrySDKOnly.mm b/Sources/Sentry/PrivateSentrySDKOnly.mm
@@ -8,6 +8,7 @@
 #import "SentryInstallation.h"
 #import "SentryInternalDefines.h"
 #import "SentryMeta.h"
+#import "SentryOptions.h"
 #import "SentryProfiledTracerConcurrency.h"
 #import "SentryProfiler.h"
 #import "SentrySDK+Private.h"
diff --git a/Sources/Sentry/Public/Sentry.h b/Sources/Sentry/Public/Sentry.h
@@ -22,7 +22,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #import "SentryGeo.h"
 #import "SentryHttpStatusCodeRange.h"
 #import "SentryHub.h"
-#import "SentryIntegrationProtocol.h"
 #import "SentryMeasurementUnit.h"
 #import "SentryMechanism.h"
 #import "SentryMechanismMeta.h"
diff --git a/Sources/Sentry/Public/SentryHub.h b/Sources/Sentry/Public/SentryHub.h
@@ -1,5 +1,4 @@
 #import "SentryDefines.h"
-#import "SentryIntegrationProtocol.h"
 #import "SentrySpanProtocol.h"
 
 @class SentryEvent, SentryClient, SentryScope, SentryUser, SentryBreadcrumb, SentryId,
diff --git a/Sources/Sentry/Public/SentryIntegrationProtocol.h b/Sources/Sentry/Public/SentryIntegrationProtocol.h
diff --git a/Sources/Sentry/SentryAppStartTrackingIntegration.m b/Sources/Sentry/SentryAppStartTrackingIntegration.m
@@ -4,6 +4,7 @@
 
 #    import "SentryAppStartTracker.h"
 #    import "SentryLog.h"
+#    import "SentryOptions.h"
 #    import <Foundation/Foundation.h>
 #    import <PrivateSentrySDKOnly.h>
 #    import <SentryAppStateManager.h>
diff --git a/Sources/Sentry/SentryBaseIntegration.m b/Sources/Sentry/SentryBaseIntegration.m
@@ -165,6 +165,10 @@ - (SentryIntegrationOption)integrationOptions
     return kIntegrationOptionNone;
 }
 
+- (void)uninstall
+{
+}
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/SentryCrashIntegration.m b/Sources/Sentry/SentryCrashIntegration.m
@@ -5,6 +5,7 @@
 #import "SentryEvent.h"
 #import "SentryHub.h"
 #import "SentryInAppLogic.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"
 #import "SentrySessionCrashedHandler.h"
diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -11,6 +11,7 @@
 #import "SentryLevelMapper.h"
 #import "SentryLog.h"
 #import "SentryNSTimerFactory.h"
+#import "SentryOptions.h"
 #import "SentryPerformanceTracker.h"
 #import "SentryProfilingConditionals.h"
 #import "SentrySDK+Private.h"
diff --git a/Sources/Sentry/SentryMetricKitIntegration.m b/Sources/Sentry/SentryMetricKitIntegration.m
@@ -3,6 +3,7 @@
 #if SENTRY_HAS_METRIC_KIT
 
 #    import "SentryInternalDefines.h"
+#    import "SentryOptions.h"
 #    import "SentryScope.h"
 #    import <Foundation/Foundation.h>
 #    import <SentryDebugMeta.h>
diff --git a/Sources/Sentry/SentryNSURLRequest.m b/Sources/Sentry/SentryNSURLRequest.m
@@ -7,8 +7,10 @@
 #import "SentryHub.h"
 #import "SentryLog.h"
 #import "SentryMeta.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 #import "SentrySerialization.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/SentryNetworkTracker.m b/Sources/Sentry/SentryNetworkTracker.m
@@ -11,6 +11,7 @@
 #import "SentryLog.h"
 #import "SentryMechanism.h"
 #import "SentryNoOpSpan.h"
+#import "SentryOptions.h"
 #import "SentryPropagationContext.h"
 #import "SentryRequest.h"
 #import "SentrySDK+Private.h"
diff --git a/Sources/Sentry/SentryPerformanceTrackingIntegration.m b/Sources/Sentry/SentryPerformanceTrackingIntegration.m
@@ -7,6 +7,7 @@
 #    import "SentryDispatchQueueWrapper.h"
 #    import "SentryLog.h"
 #    import "SentryNSProcessInfoWrapper.h"
+#    import "SentryOptions.h"
 #    import "SentrySubClassFinder.h"
 #    import "SentryUIViewControllerPerformanceTracker.h"
 #    import "SentryUIViewControllerSwizzling.h"
diff --git a/Sources/Sentry/SentryProfiler.mm b/Sources/Sentry/SentryProfiler.mm
@@ -23,6 +23,7 @@
 #    import "SentryNSNotificationCenterWrapper.h"
 #    import "SentryNSProcessInfoWrapper.h"
 #    import "SentryNSTimerFactory.h"
+#    import "SentryOptions.h"
 #    import "SentryProfileTimeseries.h"
 #    import "SentryProfiledTracerConcurrency.h"
 #    import "SentryProfilerState+ObjCpp.h"
diff --git a/Sources/Sentry/SentryRequestOperation.m b/Sources/Sentry/SentryRequestOperation.m
@@ -3,7 +3,9 @@
 #import "SentryError.h"
 #import "SentryHub.h"
 #import "SentryLog.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/SentrySessionTracker.m b/Sources/Sentry/SentrySessionTracker.m
@@ -7,6 +7,7 @@
 #import "SentryInternalNotificationNames.h"
 #import "SentryLog.h"
 #import "SentryNSNotificationCenterWrapper.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 #import "SentrySwift.h"
 
diff --git a/Sources/Sentry/SentrySwiftAsyncIntegration.m b/Sources/Sentry/SentrySwiftAsyncIntegration.m
@@ -1,5 +1,6 @@
 #import "SentrySwiftAsyncIntegration.h"
 #import "SentryCrashStackCursor_SelfThread.h"
+#import "SentryOptions.h"
 
 @implementation SentrySwiftAsyncIntegration
 
diff --git a/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m b/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m
@@ -4,6 +4,7 @@
 
 #    import "SentryHub.h"
 #    import "SentryLog.h"
+#    import "SentryOptions.h"
 #    import "SentryPerformanceTracker.h"
 #    import "SentrySDK+Private.h"
 #    import "SentryScope.h"
diff --git a/Sources/Sentry/include/SentryANRTrackingIntegration.h b/Sources/Sentry/include/SentryANRTrackingIntegration.h
@@ -1,6 +1,6 @@
 #import "SentryANRTracker.h"
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryAppStartTrackingIntegration.h b/Sources/Sentry/include/SentryAppStartTrackingIntegration.h
@@ -3,7 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryBaseIntegration.h"
-#    import "SentryIntegrationProtocol.h"
+#    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryAutoBreadcrumbTrackingIntegration.h b/Sources/Sentry/include/SentryAutoBreadcrumbTrackingIntegration.h
@@ -1,6 +1,6 @@
 #import "SentryBaseIntegration.h"
 #import "SentryBreadcrumbDelegate.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/include/SentryAutoSessionTrackingIntegration.h b/Sources/Sentry/include/SentryAutoSessionTrackingIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryBaseIntegration.h b/Sources/Sentry/include/SentryBaseIntegration.h
@@ -34,7 +34,7 @@ typedef NS_OPTIONS(NSUInteger, SentryIntegrationOption) {
 - (void)logWithReason:(NSString *)reason;
 - (BOOL)shouldBeEnabledWithOptions:(SentryOptions *)options;
 - (SentryIntegrationOption)integrationOptions;
-
+- (void)uninstall;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/include/SentryCoreDataTrackingIntegration.h b/Sources/Sentry/include/SentryCoreDataTrackingIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/include/SentryCrashIntegration.h b/Sources/Sentry/include/SentryCrashIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryFileIOTrackingIntegration.h b/Sources/Sentry/include/SentryFileIOTrackingIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/include/SentryFramesTrackingIntegration.h b/Sources/Sentry/include/SentryFramesTrackingIntegration.h
@@ -3,7 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryBaseIntegration.h"
-#    import "SentryIntegrationProtocol.h"
+#    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryHub+Private.h b/Sources/Sentry/include/SentryHub+Private.h
@@ -10,6 +10,7 @@
 @class SentrySession;
 @class SentryTracer;
 @class SentryTracerConfiguration;
+@protocol SentryIntegrationProtocol;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/include/SentryMetricKitIntegration.h b/Sources/Sentry/include/SentryMetricKitIntegration.h
@@ -4,7 +4,6 @@
 
 #    import "SentryBaseIntegration.h"
 #    import "SentryEvent.h"
-#    import "SentryIntegrationProtocol.h"
 #    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>
 
diff --git a/Sources/Sentry/include/SentryNetworkTrackingIntegration.h b/Sources/Sentry/include/SentryNetworkTrackingIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/Sentry/include/SentryPerformanceTrackingIntegration.h b/Sources/Sentry/include/SentryPerformanceTrackingIntegration.h
@@ -3,7 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryBaseIntegration.h"
-#    import "SentryIntegrationProtocol.h"
+#    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryScreenshotIntegration.h b/Sources/Sentry/include/SentryScreenshotIntegration.h
@@ -4,8 +4,8 @@
 
 #    import "SentryBaseIntegration.h"
 #    import "SentryClient+Private.h"
-#    import "SentryIntegrationProtocol.h"
 #    import "SentryScreenshot.h"
+#    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentrySwiftAsyncIntegration.h b/Sources/Sentry/include/SentrySwiftAsyncIntegration.h
@@ -1,5 +1,5 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
+#import "SentrySwift.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentryUIEventTrackingIntegration.h b/Sources/Sentry/include/SentryUIEventTrackingIntegration.h
@@ -3,7 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryBaseIntegration.h"
-#    import "SentryIntegrationProtocol.h"
+#    import "SentrySwift.h"
 
 @interface SentryUIEventTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
 
diff --git a/Sources/Sentry/include/SentryViewHierarchyIntegration.h b/Sources/Sentry/include/SentryViewHierarchyIntegration.h
diff --git a/Sources/Sentry/include/SentryWatchdogTerminationTrackingIntegration.h b/Sources/Sentry/include/SentryWatchdogTerminationTrackingIntegration.h
diff --git a/Sources/Swift/Protocol/SentryIntegrationProtocol.swift b/Sources/Swift/Protocol/SentryIntegrationProtocol.swift
diff --git a/Tests/SentryProfilerTests/SentryProfilerTests.mm b/Tests/SentryProfilerTests/SentryProfilerTests.mm
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryTestIntegration.h b/Tests/SentryTests/Integrations/SentryCrash/SentryTestIntegration.h
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryTestIntegration.m b/Tests/SentryTests/Integrations/SentryCrash/SentryTestIntegration.m
diff --git a/Tests/SentryTests/SentrySDKTests.swift b/Tests/SentryTests/SentrySDKTests.swift
diff --git a/Tests/SentryTests/State/SentryHub+Test.h b/Tests/SentryTests/State/SentryHub+Test.h
diff --git a/Tests/SentryTests/TestUtils/EmptyIntegration.swift b/Tests/SentryTests/TestUtils/EmptyIntegration.swift

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#import "SentryDefines.h"`
`2`		`-#import "SentryIntegrationProtocol.h"`
`3`	`2`	`#import "SentrySpanProtocol.h"`
`4`	`3`
`5`	`4`	`@class SentryEvent, SentryClient, SentryScope, SentryUser, SentryBreadcrumb, SentryId,`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,10 @@ - (SentryIntegrationOption)integrationOptions`
`165`	`165`	`return kIntegrationOptionNone;`
`166`	`166`	`}`
`167`	`167`
	`168`	`+- (void)uninstall`
	`169`	`+{`
	`170`	`+}`
	`171`	`+`
`168`	`172`	`@end`
`169`	`173`
`170`	`174`	`NS_ASSUME_NONNULL_END`