Skip to content

Commit bbfbdc6

Browse files
noahsmartinnoahsmartin
committed
Undo rename
1 parent e6741e0 commit bbfbdc6

File tree

14 files changed

+55
-49
lines changed

14 files changed

+55
-49
lines changed

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
7B26BBFB24C0A66D00A79CCC /* SentrySdkInfoNilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */; };
359359
7B2A70D827D5F080008B0D15 /* SentryANRTrackerV1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */; };
360360
7B2A70DF27D60904008B0D15 /* SentryTestThreadWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */; };
361-
7B2BB0032966F55900A1E102 /* SentryOptionsHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
361+
7B2BB0032966F55900A1E102 /* SentryOptionsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
362362
7B30B68026527C3C006B2752 /* SentryFramesTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B30B67F26527C3C006B2752 /* SentryFramesTrackerTests.swift */; };
363363
7B31C291277B04A000337126 /* SentryCrashPlatformSpecificDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B31C290277B04A000337126 /* SentryCrashPlatformSpecificDefines.h */; };
364364
7B3398632459C14000BD9C96 /* SentryEnvelopeRateLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B3398622459C14000BD9C96 /* SentryEnvelopeRateLimit.h */; };
@@ -1131,7 +1131,7 @@
11311131
FABE8E172E307A7F0040809A /* Dependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABE8E162E307A7C0040809A /* Dependencies.swift */; };
11321132
FAC62B652E15A4100003909D /* SentrySDKThreadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC62B642E15A40C0003909D /* SentrySDKThreadTests.swift */; };
11331133
FAC735232E25AA81006C5A64 /* SentryProfilingSwiftHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FAC735222E25AA7A006C5A64 /* SentryProfilingSwiftHelpersTests.m */; };
1134-
FACEED132E3179A10007B4AC /* SentyOptionsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */; };
1134+
FACEED132E3179A10007B4AC /* SentryOptionsInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */; };
11351135
FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
11361136
FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
11371137
FAE579842E7CF21800B710F9 /* SentryMigrateSessionInit.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE5797E2E7CF21300B710F9 /* SentryMigrateSessionInit.swift */; };
@@ -1652,7 +1652,7 @@
16521652
7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySdkInfoNilTests.m; sourceTree = "<group>"; };
16531653
7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryANRTrackerV1Tests.swift; sourceTree = "<group>"; };
16541654
7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTestThreadWrapper.swift; sourceTree = "<group>"; };
1655-
7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsHelpers.h; path = include/HybridPublic/SentryOptionsHelpers.h; sourceTree = "<group>"; };
1655+
7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsInternal.h; path = include/HybridPublic/SentryOptionsInternal.h; sourceTree = "<group>"; };
16561656
7B30B67F26527C3C006B2752 /* SentryFramesTrackerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFramesTrackerTests.swift; sourceTree = "<group>"; };
16571657
7B30B68126527C55006B2752 /* TestDisplayLinkWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestDisplayLinkWrapper.swift; sourceTree = "<group>"; };
16581658
7B31C290277B04A000337126 /* SentryCrashPlatformSpecificDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryCrashPlatformSpecificDefines.h; sourceTree = "<group>"; };
@@ -2513,7 +2513,7 @@
25132513
FABE8E162E307A7C0040809A /* Dependencies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dependencies.swift; sourceTree = "<group>"; };
25142514
FAC62B642E15A40C0003909D /* SentrySDKThreadTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDKThreadTests.swift; sourceTree = "<group>"; };
25152515
FAC735222E25AA7A006C5A64 /* SentryProfilingSwiftHelpersTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpersTests.m; sourceTree = "<group>"; };
2516-
FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentyOptionsHelper.m; sourceTree = "<group>"; };
2516+
FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryOptionsInternal.m; sourceTree = "<group>"; };
25172517
FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
25182518
FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
25192519
FAE5797E2E7CF21300B710F9 /* SentryMigrateSessionInit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryMigrateSessionInit.swift; sourceTree = "<group>"; };
@@ -3119,11 +3119,11 @@
31193119
7B610D5E2512390E00B0B5D9 /* SentrySDK+Private.h */,
31203120
FA6555132E30181B009917BC /* SentrySDKInternal.h */,
31213121
FA6555152E30182B009917BC /* SentrySDKInternal.m */,
3122-
FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */,
3122+
FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */,
31233123
63EED6BC2237923600E02400 /* SentryOptions.h */,
31243124
63EED6BD2237923600E02400 /* SentryOptions.m */,
31253125
7BDEAA002632A4580001EA25 /* SentryOptions+Private.h */,
3126-
7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */,
3126+
7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */,
31273127
7D9B079F23D1E89800C5FC8E /* SentryMeta.h */,
31283128
7D082B8023C628780029866B /* SentryMeta.m */,
31293129
D4ECA3FF2E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m */,
@@ -5206,7 +5206,7 @@
52065206
A8AFFCCF2906C03700967CD7 /* SentryRequest.h in Headers */,
52075207
D82859442C3E753C009A28AA /* SentrySessionReplaySyncC.h in Headers */,
52085208
8459FCBE2BD73E820038E9C9 /* SentryProfilerSerialization.h in Headers */,
5209-
7B2BB0032966F55900A1E102 /* SentryOptionsHelpers.h in Headers */,
5209+
7B2BB0032966F55900A1E102 /* SentryOptionsInternal.h in Headers */,
52105210
7BF9EF762722B34700B5BBEF /* SentrySubClassFinder.h in Headers */,
52115211
7BC852332458802C005A70F0 /* SentryDataCategoryMapper.h in Headers */,
52125212
7BDB03B7251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h in Headers */,
@@ -6079,7 +6079,7 @@
60796079
636085141ED47BE600E8599E /* SentryFileManagerHelper.m in Sources */,
60806080
63FE710B20DA4C1000CDBAE8 /* SentryCrashMach.c in Sources */,
60816081
63FE707720DA4C1000CDBAE8 /* SentryDictionaryDeepSearch.m in Sources */,
6082-
FACEED132E3179A10007B4AC /* SentyOptionsHelper.m in Sources */,
6082+
FACEED132E3179A10007B4AC /* SentryOptionsInternal.m in Sources */,
60836083
FAAB95C02EA163590030A2DB /* SentryScopeObserver.swift in Sources */,
60846084
D48891D02E98F2E700212823 /* SentryInfoPlistError.swift in Sources */,
60856085
8482FA9C2DD7C397000E9283 /* SentryFeedbackAPI.m in Sources */,

‎Sources/Resources/Sentry.modulemap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ framework module Sentry {
1111
header "SentryAppStartMeasurement.h"
1212
header "SentryBreadcrumb+Private.h"
1313
header "SentryFormatter.h"
14-
header "SentryOptionsHelpers.h"
14+
header "SentryOptionsInternal.h"
1515
header "SentrySwizzle.h"
1616
header "SentryUser+Private.h"
1717

‎Sources/Sentry/SentryOptions.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import "SentryMeta.h"
1313
#import "SentryNetworkTrackingIntegration.h"
1414
#import "SentryOptions+Private.h"
15-
#import "SentryOptionsHelpers.h"
15+
#import "SentryOptionsInternal.h"
1616
#import "SentrySDKInternal.h"
1717
#import "SentryScope.h"
1818
#import "SentrySessionReplayIntegration.h"
@@ -46,7 +46,7 @@ - (void)setBeforeSendLogDynamic:(id)beforeSendLogDynamic
4646

4747
+ (NSArray<NSString *> *)defaultIntegrations
4848
{
49-
NSArray<Class> *defaultIntegrationClasses = [SentryOptionsHelpers defaultIntegrationClasses];
49+
NSArray<Class> *defaultIntegrationClasses = [SentryOptionsInternal defaultIntegrationClasses];
5050
NSMutableArray<NSString *> *defaultIntegrationNames =
5151
[[NSMutableArray alloc] initWithCapacity:defaultIntegrationClasses.count];
5252

‎Sources/Sentry/SentyOptionsHelper.m‎ renamed to ‎Sources/Sentry/SentryOptionsInternal.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#import "SentryOptionsInternal.h"
12
#import "SentryANRTrackingIntegration.h"
23
#import "SentryAutoBreadcrumbTrackingIntegration.h"
34
#import "SentryAutoSessionTrackingIntegration.h"
@@ -10,7 +11,6 @@
1011
#import "SentryNetworkTrackingIntegration.h"
1112
#import "SentryOptions+Private.h"
1213
#import "SentryOptions.h"
13-
#import "SentryOptionsHelpers.h"
1414
#import "SentrySessionReplayIntegration.h"
1515
#import "SentrySwift.h"
1616
#import "SentrySwiftAsyncIntegration.h"
@@ -30,7 +30,7 @@
3030
# import "SentryMetricKitIntegration.h"
3131
#endif // SENTRY_HAS_METRIC_KIT
3232

33-
@implementation SentryOptionsHelpers
33+
@implementation SentryOptionsInternal
3434

3535
+ (NSArray<Class> *)defaultIntegrationClasses
3636
{
@@ -71,9 +71,9 @@ + (nullable SentryOptions *)initWithDict:(NSDictionary<NSString *, id> *)options
7171
didFailWithError:(NSError *_Nullable *_Nullable)error
7272
{
7373
SentryOptions *sentryOptions = [[SentryOptions alloc] init];
74-
if (![SentryOptionsHelpers validateOptions:options
75-
sentryOptions:sentryOptions
76-
didFailWithError:error]) {
74+
if (![SentryOptionsInternal validateOptions:options
75+
sentryOptions:sentryOptions
76+
didFailWithError:error]) {
7777
if (error != nil) {
7878
SENTRY_LOG_ERROR(@"Failed to initialize SentryOptions: %@", *error);
7979
} else {

‎Sources/Sentry/SentrySDKInternal.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "SentryLogC.h"
1111
#import "SentryMeta.h"
1212
#import "SentryOptions+Private.h"
13-
#import "SentryOptionsHelpers.h"
13+
#import "SentryOptionsInternal.h"
1414
#import "SentryProfilingConditionals.h"
1515
#import "SentryReplayApi.h"
1616
#import "SentrySamplerDecision.h"
@@ -532,7 +532,7 @@ + (void)installIntegrations
532532
SentryOptions *options = [SentrySDKInternal.currentHub getClient].options;
533533
NSMutableArray<NSString *> *integrationNames = [SentryOptions defaultIntegrations].mutableCopy;
534534

535-
NSArray<Class> *defaultIntegrations = SentryOptionsHelpers.defaultIntegrationClasses;
535+
NSArray<Class> *defaultIntegrations = SentryOptionsInternal.defaultIntegrationClasses;
536536

537537
// Since 8.22.0, we use a precompiled XCFramework for SPM, which can lead to Sentry's
538538
// definition getting duplicated in the app with a warning “SentrySDK is defined in both

‎Sources/Sentry/include/HybridPublic/SentryOptionsHelpers.h‎ renamed to ‎Sources/Sentry/include/HybridPublic/SentryOptionsInternal.h‎

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

55
NS_ASSUME_NONNULL_BEGIN
66

7-
@interface SentryOptionsHelpers : NSObject
7+
@interface SentryOptionsInternal : NSObject
88

99
@property (nonatomic, readonly, class) NSArray<Class> *defaultIntegrationClasses;
1010

‎Tests/DuplicatedSDKTest/DuplicatedSDKTest/DuplicatedSDKTest-Bridging-Header.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
#import <Sentry/Sentry.h>
33

44
// Added to run integration tests, do not attempt this in your app
5+
@interface SentryHubInternal : NSObject
6+
7+
@property (nonatomic, strong) NSMutableArray<id<SentryIntegrationProtocol>> *installedIntegrations;
8+
9+
@end
10+
511
@interface SentrySDKInternal : NSObject
612

713
+ (SentryHubInternal *)currentHub;

‎Tests/SentryTests/Networking/SentryDsnTests.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "SentryDsn.h"
22
#import "SentryError.h"
33
#import "SentryMeta.h"
4-
#import "SentryOptionsHelpers.h"
4+
#import "SentryOptionsInternal.h"
55
#import "SentrySwift.h"
66
#import <XCTest/XCTest.h>
77

@@ -14,35 +14,35 @@ @implementation SentryDsnTests
1414
- (void)testMissingUsernamePassword
1515
{
1616
NSError *error = nil;
17-
SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"https://sentry.io" }
18-
didFailWithError:&error];
17+
SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"https://sentry.io" }
18+
didFailWithError:&error];
1919
XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
2020
XCTAssertNil(options);
2121
}
2222

2323
- (void)testMissingScheme
2424
{
2525
NSError *error = nil;
26-
SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"https://sentry.io" }
27-
didFailWithError:&error];
26+
SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"https://sentry.io" }
27+
didFailWithError:&error];
2828
XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
2929
XCTAssertNil(options);
3030
}
3131

3232
- (void)testMissingHost
3333
{
3434
NSError *error = nil;
35-
SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"http:///1" }
36-
didFailWithError:&error];
35+
SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"http:///1" }
36+
didFailWithError:&error];
3737
XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
3838
XCTAssertNil(options);
3939
}
4040

4141
- (void)testUnsupportedProtocol
4242
{
4343
NSError *error = nil;
44-
SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"ftp://sentry.io/1" }
45-
didFailWithError:&error];
44+
SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"ftp://sentry.io/1" }
45+
didFailWithError:&error];
4646
XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
4747
XCTAssertNil(options);
4848
}

‎Tests/SentryTests/Networking/SentryTransportInitializerTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SentryTransportInitializerTests: XCTestCase {
2424
}
2525

2626
func testDefault() throws {
27-
let options = try SentryOptionsHelpers.initWithDict(["dsn": SentryTransportInitializerTests.dsnAsString])
27+
let options = try SentryOptionsInternal.initWithDict(["dsn": SentryTransportInitializerTests.dsnAsString])
2828

2929
let result = TransportInitializer.initTransports(
3030
options,

‎Tests/SentryTests/Protocol/SentrySDKSettingsTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SentrySDKSettingsTests: XCTestCase {
1313
}
1414

1515
func testInitWithOptions_WhenSendDefaultPiiTrue_SetsAutoInferIPToTrue() {
16-
let options = try! SentryOptionsHelpers.initWithDict([
16+
let options = try! SentryOptionsInternal.initWithDict([
1717
"dsn": "https://username:[email protected]/12345",
1818
"sendDefaultPii": true
1919
])
@@ -27,7 +27,7 @@ class SentrySDKSettingsTests: XCTestCase {
2727
}
2828

2929
func testInitWithOptions_WhenSendDefaultPiiFalse_SetsAutoInferIPToFalse() {
30-
let options = try! SentryOptionsHelpers.initWithDict([
30+
let options = try! SentryOptionsInternal.initWithDict([
3131
"dsn": "https://username:[email protected]/12345",
3232
"sendDefaultPii": false
3333
])

0 commit comments

Comments
 (0)