Skip to content

Commit 3319d58

Browse files
authored
ref: Remove v9 checks for debug image provider (#6454)
1 parent f5c28e7 commit 3319d58

23 files changed

+68
-450
lines changed

Sentry.xcodeproj/project.pbxproj

Lines changed: 12 additions & 18 deletions
Large diffs are not rendered by default.

SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#import "SentryCrashCachedData.h"
3030
#import "SentryCrashInstallation+Private.h"
3131
#import "SentryCrashMonitor_MachException.h"
32-
#import "SentryDebugImageProvider+HybridSDKs.h"
3332
#import "SentryDefaultThreadInspector.h"
3433
#import "SentryDependencyContainer.h"
3534
#import "SentryFileManager+Test.h"

SentryTestUtils/TestDebugImageProvider.swift

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
import _SentryPrivate
22
import Foundation
3-
@testable import Sentry
3+
@_spi(Private) @testable import Sentry
44

5-
public class TestDebugImageProvider: SentryDebugImageProvider {
5+
@_spi(Private) public class TestDebugImageProvider: SentryDebugImageProvider {
66
public var debugImages: [DebugMeta]?
7-
8-
@available(*, deprecated)
9-
public override func getDebugImages() -> [DebugMeta] {
10-
getDebugImagesCrashed(true)
11-
}
12-
13-
@available(*, deprecated)
14-
public override func getDebugImagesCrashed(_ isCrash: Bool) -> [DebugMeta] {
15-
debugImages ?? super.getDebugImagesCrashed(isCrash)
16-
}
177

188
public var getDebugImagesFromCacheForFramesInvocations = Invocations<Void>()
199
public override func getDebugImagesFromCacheForFrames(frames: [Frame]) -> [DebugMeta] {

Sources/Resources/Sentry.modulemap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ framework module Sentry {
1010
header "PrivatesHeader.h"
1111
header "SentryAppStartMeasurement.h"
1212
header "SentryBreadcrumb+Private.h"
13-
header "SentryDebugImageProvider+HybridSDKs.h"
1413
header "SentryDependencyContainer.h"
1514
header "SentryFormatter.h"
1615
header "SentryOptionsInternal.h"

Sources/Sentry/PrivateSentrySDKOnly.m

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#import "SentryAppStartMeasurement.h"
33
#import "SentryBreadcrumb+Private.h"
44
#import "SentryClient.h"
5-
#import "SentryDebugImageProvider+HybridSDKs.h"
6-
#import "SentryDebugImageProvider.h"
75
#import "SentryHub+Private.h"
86
#import "SentryInstallation.h"
97
#import "SentryInternalDefines.h"
@@ -50,23 +48,6 @@ + (nullable SentryEnvelope *)envelopeWithData:(NSData *)data
5048
return [SentrySerializationSwift envelopeWithData:data];
5149
}
5250

53-
#if !SDK_V9
54-
+ (NSArray<SentryDebugMeta *> *)getDebugImages
55-
{
56-
// maintains previous behavior for the same method call by also trying to gather crash info
57-
return [self getDebugImagesCrashed:YES];
58-
}
59-
60-
+ (NSArray<SentryDebugMeta *> *)getDebugImagesCrashed:(BOOL)isCrash
61-
{
62-
# pragma clang diagnostic push
63-
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
64-
return [[SentryDependencyContainer sharedInstance].debugImageProvider
65-
getDebugImagesCrashed:isCrash];
66-
# pragma clang diagnostic pop
67-
}
68-
#endif // !SDK_V9
69-
7051
+ (nullable SentryAppStartMeasurement *)appStartMeasurement
7152
{
7253
return [SentrySDKInternal getAppStartMeasurement];

Sources/Sentry/Profiling/SentryProfilerSerialization.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
# import "SentryClient+Private.h"
66
# import "SentryDateUtils.h"
7-
# import "SentryDebugImageProvider+HybridSDKs.h"
87
# import "SentryDependencyContainer.h"
98
# import "SentryDevice.h"
109
# import "SentryEnvelopeItemHeader.h"

Sources/Sentry/Public/Sentry.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
1212
# import <Sentry/SentryBreadcrumb.h>
1313
# import <Sentry/SentryClient.h>
1414
# import <Sentry/SentryCrashExceptionApplication.h>
15-
# import <Sentry/SentryDebugImageProvider.h>
1615
# import <Sentry/SentryDebugMeta.h>
1716
# import <Sentry/SentryDefines.h>
1817
# import <Sentry/SentryDsn.h>

Sources/Sentry/Public/SentryDebugImageProvider.h

Lines changed: 0 additions & 93 deletions
This file was deleted.

Sources/Sentry/Public/SentryWithoutUIKit.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
1313
# import <SentryWithoutUIKit/SentryBreadcrumb.h>
1414
# import <SentryWithoutUIKit/SentryClient.h>
1515
# import <SentryWithoutUIKit/SentryCrashExceptionApplication.h>
16-
# import <SentryWithoutUIKit/SentryDebugImageProvider.h>
1716
# import <SentryWithoutUIKit/SentryDebugMeta.h>
1817
# import <SentryWithoutUIKit/SentryDefines.h>
1918
# import <SentryWithoutUIKit/SentryDsn.h>

Sources/Sentry/SentryANRTrackingIntegration.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import "SentryANRTrackingIntegration.h"
22
#import "SentryCrashMachineContext.h"
3-
#import "SentryDebugImageProvider+HybridSDKs.h"
43
#import "SentryDependencyContainer.h"
54
#import "SentryEvent.h"
65
#import "SentryException.h"

0 commit comments

Comments
 (0)