Merge branch 'master' into ref/sentry-exception

getsentry · Mar 26, 2021 · 9d11092 · 9d11092
2 parents 4e9c2eb + bbd52a7
commit 9d11092
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Breaking Changes
 
 - ref: Align SentryException with unified API #1026: Replaced `SentryException.thread` with `SentryException.threadId` and `SentryException.stacktrace`.
+- ref: Remove deprecated SentryHub.getScope #1025: Use `SentryHub.scope` instead.
 - ref: Make closeCachedSessionWithTimestamp private #1022
 - ref: Improve envelope API for Hybrid SDKs #1020: We removed `SentryClient.storeEnvelope`, which is reserved for Hybrid SDKs.
 - ref: Remove currentHub from SentrySDK #1019: We removed `SentrySDK.currentHub` and `SentrySDK.setCurrentHub`. In case you need this methods, please open up an issue.

diff --git a/Sources/Sentry/Public/SentryHub.h b/Sources/Sentry/Public/SentryHub.h
@@ -174,11 +174,6 @@ SENTRY_NO_INIT
  */
 - (SentryClient *_Nullable)getClient;
 
-/**
- * Returns either the current scope and if nil a new one.
- */
-- (SentryScope *)getScope __deprecated_msg("Use SentryHub.scope instead.");
-
 /**
  * Returns either the current scope and if nil a new one.
  */

diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -363,11 +363,6 @@ - (SentryScope *)scope
     }
 }
 
-- (SentryScope *)getScope
-{
-    return self.scope;
-}
-
 - (void)configureScope:(void (^)(SentryScope *scope))callback
 {
     SentryScope *scope = self.scope;