ref: Use scope observer protocol in dependency container (#6423)

Author: noahsmartin

Sources/Sentry/SentryDependencyContainer.m

@@ -410,8 +410,7 @@ - (SentryDebugImageProvider *)debugImageProvider SENTRY_THREAD_SANITIZER_DOUBLE_
 }
 
 #if SENTRY_HAS_UIKIT
-- (SentryWatchdogTerminationScopeObserver *)getWatchdogTerminationScopeObserverWithOptions:
-    (SentryOptions *)options
+- (id<SentryScopeObserver>)getWatchdogTerminationScopeObserverWithOptions:(SentryOptions *)options
 {
     // This method is only a factory, therefore do not keep a reference.
     // The scope observer will be created each time it is needed.

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -88,9 +88,8 @@ - (BOOL)installWithOptions:(SentryOptions *)options
 
     self.appStateManager = appStateManager;
 
-    SentryWatchdogTerminationScopeObserver *scopeObserver =
-        [SentryDependencyContainer.sharedInstance
-            getWatchdogTerminationScopeObserverWithOptions:options];
+    id<SentryScopeObserver> scopeObserver = [SentryDependencyContainer.sharedInstance
+        getWatchdogTerminationScopeObserverWithOptions:options];
 
     [SentrySDKInternal.currentHub configureScope:^(SentryScope *_Nonnull outerScope) {
         // Add the observer to the scope so that it can be notified when the scope changes.

Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h

@@ -47,8 +47,8 @@
 @class SentryScreenshotSource;
 @class SentryViewHierarchyProvider;
 @class SentryUIViewControllerPerformanceTracker;
-@class SentryWatchdogTerminationScopeObserver;
 @class SentryWatchdogTerminationAttributesProcessor;
+@protocol SentryScopeObserver;
 #endif // SENTRY_UIKIT_AVAILABLE
 
 #if SENTRY_HAS_UIKIT
@@ -142,8 +142,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong) id<SentryObjCRuntimeWrapper> objcRuntimeWrapper;
 
 #if SENTRY_HAS_UIKIT
-- (SentryWatchdogTerminationScopeObserver *)getWatchdogTerminationScopeObserverWithOptions:
-    (SentryOptions *)options;
+- (id<SentryScopeObserver>)getWatchdogTerminationScopeObserverWithOptions:(SentryOptions *)options;
 @property (nonatomic, strong)
     SentryWatchdogTerminationAttributesProcessor *watchdogTerminationAttributesProcessor;
 #endif

Sources/Sentry/include/SentryScope+Private.h

@@ -1,12 +1,13 @@
 #import <Foundation/Foundation.h>
 
 #import "SentryScope.h"
-#import "SentryScopeObserver.h"
 
 @class SentryAttachment;
 @class SentryPropagationContext;
 @class SentrySession;
 
+@protocol SentryScopeObserver;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SentryScope ()