Undo rename

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -358,7 +358,7 @@
 		7B26BBFB24C0A66D00A79CCC /* SentrySdkInfoNilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */; };
 		7B2A70D827D5F080008B0D15 /* SentryANRTrackerV1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */; };
 		7B2A70DF27D60904008B0D15 /* SentryTestThreadWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */; };
-		7B2BB0032966F55900A1E102 /* SentryOptionsHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		7B2BB0032966F55900A1E102 /* SentryOptionsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7B30B68026527C3C006B2752 /* SentryFramesTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B30B67F26527C3C006B2752 /* SentryFramesTrackerTests.swift */; };
 		7B31C291277B04A000337126 /* SentryCrashPlatformSpecificDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B31C290277B04A000337126 /* SentryCrashPlatformSpecificDefines.h */; };
 		7B3398632459C14000BD9C96 /* SentryEnvelopeRateLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B3398622459C14000BD9C96 /* SentryEnvelopeRateLimit.h */; };
@@ -1131,7 +1131,7 @@
 		FABE8E172E307A7F0040809A /* Dependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABE8E162E307A7C0040809A /* Dependencies.swift */; };
 		FAC62B652E15A4100003909D /* SentrySDKThreadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC62B642E15A40C0003909D /* SentrySDKThreadTests.swift */; };
 		FAC735232E25AA81006C5A64 /* SentryProfilingSwiftHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FAC735222E25AA7A006C5A64 /* SentryProfilingSwiftHelpersTests.m */; };
-		FACEED132E3179A10007B4AC /* SentyOptionsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */; };
+		FACEED132E3179A10007B4AC /* SentryOptionsInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */; };
 		FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
 		FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
 		FAE579842E7CF21800B710F9 /* SentryMigrateSessionInit.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE5797E2E7CF21300B710F9 /* SentryMigrateSessionInit.swift */; };
@@ -1652,7 +1652,7 @@
 		7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySdkInfoNilTests.m; sourceTree = "<group>"; };
 		7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryANRTrackerV1Tests.swift; sourceTree = "<group>"; };
 		7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTestThreadWrapper.swift; sourceTree = "<group>"; };
-		7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsHelpers.h; path = include/HybridPublic/SentryOptionsHelpers.h; sourceTree = "<group>"; };
+		7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsInternal.h; path = include/HybridPublic/SentryOptionsInternal.h; sourceTree = "<group>"; };
 		7B30B67F26527C3C006B2752 /* SentryFramesTrackerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFramesTrackerTests.swift; sourceTree = "<group>"; };
 		7B30B68126527C55006B2752 /* TestDisplayLinkWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestDisplayLinkWrapper.swift; sourceTree = "<group>"; };
 		7B31C290277B04A000337126 /* SentryCrashPlatformSpecificDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryCrashPlatformSpecificDefines.h; sourceTree = "<group>"; };
@@ -2513,7 +2513,7 @@
 		FABE8E162E307A7C0040809A /* Dependencies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dependencies.swift; sourceTree = "<group>"; };
 		FAC62B642E15A40C0003909D /* SentrySDKThreadTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDKThreadTests.swift; sourceTree = "<group>"; };
 		FAC735222E25AA7A006C5A64 /* SentryProfilingSwiftHelpersTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpersTests.m; sourceTree = "<group>"; };
-		FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentyOptionsHelper.m; sourceTree = "<group>"; };
+		FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryOptionsInternal.m; sourceTree = "<group>"; };
 		FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
 		FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
 		FAE5797E2E7CF21300B710F9 /* SentryMigrateSessionInit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryMigrateSessionInit.swift; sourceTree = "<group>"; };
@@ -3119,11 +3119,11 @@
 				7B610D5E2512390E00B0B5D9 /* SentrySDK+Private.h */,
 				FA6555132E30181B009917BC /* SentrySDKInternal.h */,
 				FA6555152E30182B009917BC /* SentrySDKInternal.m */,
-				FACEED122E3179A10007B4AC /* SentyOptionsHelper.m */,
+				FACEED122E3179A10007B4AC /* SentryOptionsInternal.m */,
 				63EED6BC2237923600E02400 /* SentryOptions.h */,
 				63EED6BD2237923600E02400 /* SentryOptions.m */,
 				7BDEAA002632A4580001EA25 /* SentryOptions+Private.h */,
-				7B2BB0012966F55900A1E102 /* SentryOptionsHelpers.h */,
+				7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */,
 				7D9B079F23D1E89800C5FC8E /* SentryMeta.h */,
 				7D082B8023C628780029866B /* SentryMeta.m */,
 				D4ECA3FF2E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m */,
@@ -5206,7 +5206,7 @@
 				A8AFFCCF2906C03700967CD7 /* SentryRequest.h in Headers */,
 				D82859442C3E753C009A28AA /* SentrySessionReplaySyncC.h in Headers */,
 				8459FCBE2BD73E820038E9C9 /* SentryProfilerSerialization.h in Headers */,
-				7B2BB0032966F55900A1E102 /* SentryOptionsHelpers.h in Headers */,
+				7B2BB0032966F55900A1E102 /* SentryOptionsInternal.h in Headers */,
 				7BF9EF762722B34700B5BBEF /* SentrySubClassFinder.h in Headers */,
 				7BC852332458802C005A70F0 /* SentryDataCategoryMapper.h in Headers */,
 				7BDB03B7251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h in Headers */,
@@ -6079,7 +6079,7 @@
 				636085141ED47BE600E8599E /* SentryFileManagerHelper.m in Sources */,
 				63FE710B20DA4C1000CDBAE8 /* SentryCrashMach.c in Sources */,
 				63FE707720DA4C1000CDBAE8 /* SentryDictionaryDeepSearch.m in Sources */,
-				FACEED132E3179A10007B4AC /* SentyOptionsHelper.m in Sources */,
+				FACEED132E3179A10007B4AC /* SentryOptionsInternal.m in Sources */,
 				FAAB95C02EA163590030A2DB /* SentryScopeObserver.swift in Sources */,
 				D48891D02E98F2E700212823 /* SentryInfoPlistError.swift in Sources */,
 				8482FA9C2DD7C397000E9283 /* SentryFeedbackAPI.m in Sources */,

Sources/Resources/Sentry.modulemap

@@ -11,7 +11,7 @@ framework module Sentry {
         header "SentryAppStartMeasurement.h"
         header "SentryBreadcrumb+Private.h"
         header "SentryFormatter.h"
-        header "SentryOptionsHelpers.h"
+        header "SentryOptionsInternal.h"
         header "SentrySwizzle.h"
         header "SentryUser+Private.h"
 

Sources/Sentry/Public/SentryId.h

@@ -1,26 +1,11 @@
 #import <Foundation/Foundation.h>
-#if !defined(SWIFT_CLASS_PROPERTY)
-#    if __has_feature(objc_class_property)
-#        define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
-#    else
-#        define SWIFT_CLASS_PROPERTY(...)
-#    endif
-#endif
-
-#if !defined(OBJC_DESIGNATED_INITIALIZER)
-#    if __has_attribute(objc_designated_initializer)
-#        define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
-#    else
-#        define OBJC_DESIGNATED_INITIALIZER
-#    endif
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SentryId : NSObject
 
 /// A @c SentryId with an empty UUID “00000000000000000000000000000000”.
-SWIFT_CLASS_PROPERTY(@property(nonatomic, class, readonly, strong) SentryId *_Nonnull empty;)
+@property(nonatomic, class, readonly, strong) SentryId *_Nonnull empty;
 + (SentryId *_Nonnull)empty __attribute__((warn_unused_result));
 
 /// Returns a 32 lowercase character hexadecimal string description of the @c SentryId, such as

Sources/Sentry/SentryOptions.m

@@ -12,7 +12,7 @@
 #import "SentryMeta.h"
 #import "SentryNetworkTrackingIntegration.h"
 #import "SentryOptions+Private.h"
-#import "SentryOptionsHelpers.h"
+#import "SentryOptionsInternal.h"
 #import "SentrySDKInternal.h"
 #import "SentryScope.h"
 #import "SentrySessionReplayIntegration.h"
@@ -46,7 +46,7 @@ - (void)setBeforeSendLogDynamic:(id)beforeSendLogDynamic
 
 + (NSArray<NSString *> *)defaultIntegrations
 {
-    NSArray<Class> *defaultIntegrationClasses = [SentryOptionsHelpers defaultIntegrationClasses];
+    NSArray<Class> *defaultIntegrationClasses = [SentryOptionsInternal defaultIntegrationClasses];
     NSMutableArray<NSString *> *defaultIntegrationNames =
         [[NSMutableArray alloc] initWithCapacity:defaultIntegrationClasses.count];
 

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

@@ -1,3 +1,4 @@
+#import "SentryOptionsInternal.h"
 #import "SentryANRTrackingIntegration.h"
 #import "SentryAutoBreadcrumbTrackingIntegration.h"
 #import "SentryAutoSessionTrackingIntegration.h"
@@ -10,7 +11,6 @@
 #import "SentryNetworkTrackingIntegration.h"
 #import "SentryOptions+Private.h"
 #import "SentryOptions.h"
-#import "SentryOptionsHelpers.h"
 #import "SentrySessionReplayIntegration.h"
 #import "SentrySwift.h"
 #import "SentrySwiftAsyncIntegration.h"
@@ -30,7 +30,7 @@
 #    import "SentryMetricKitIntegration.h"
 #endif // SENTRY_HAS_METRIC_KIT
 
-@implementation SentryOptionsHelpers
+@implementation SentryOptionsInternal
 
 + (NSArray<Class> *)defaultIntegrationClasses
 {
@@ -71,9 +71,9 @@ + (nullable SentryOptions *)initWithDict:(NSDictionary<NSString *, id> *)options
                         didFailWithError:(NSError *_Nullable *_Nullable)error
 {
     SentryOptions *sentryOptions = [[SentryOptions alloc] init];
-    if (![SentryOptionsHelpers validateOptions:options
-                                 sentryOptions:sentryOptions
-                              didFailWithError:error]) {
+    if (![SentryOptionsInternal validateOptions:options
+                                  sentryOptions:sentryOptions
+                               didFailWithError:error]) {
         if (error != nil) {
             SENTRY_LOG_ERROR(@"Failed to initialize SentryOptions: %@", *error);
         } else {

Sources/Sentry/SentrySDKInternal.m

@@ -10,7 +10,7 @@
 #import "SentryLogC.h"
 #import "SentryMeta.h"
 #import "SentryOptions+Private.h"
-#import "SentryOptionsHelpers.h"
+#import "SentryOptionsInternal.h"
 #import "SentryProfilingConditionals.h"
 #import "SentryReplayApi.h"
 #import "SentrySamplerDecision.h"
@@ -532,7 +532,7 @@ + (void)installIntegrations
     SentryOptions *options = [SentrySDKInternal.currentHub getClient].options;
     NSMutableArray<NSString *> *integrationNames = [SentryOptions defaultIntegrations].mutableCopy;
 
-    NSArray<Class> *defaultIntegrations = SentryOptionsHelpers.defaultIntegrationClasses;
+    NSArray<Class> *defaultIntegrations = SentryOptionsInternal.defaultIntegrationClasses;
 
     // Since 8.22.0, we use a precompiled XCFramework for SPM, which can lead to Sentry's
     // 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

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryOptionsHelpers : NSObject
+@interface SentryOptionsInternal : NSObject
 
 @property (nonatomic, readonly, class) NSArray<Class> *defaultIntegrationClasses;
 

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

@@ -2,6 +2,12 @@
 #import <Sentry/Sentry.h>
 
 // Added to run integration tests, do not attempt this in your app
+@interface SentryHubInternal : NSObject
+
+@property (nonatomic, strong) NSMutableArray<id<SentryIntegrationProtocol>> *installedIntegrations;
+
+@end
+
 @interface SentrySDKInternal : NSObject
 
 + (SentryHubInternal *)currentHub;

Tests/SentryTests/Networking/SentryDsnTests.m

@@ -1,7 +1,7 @@
 #import "SentryDsn.h"
 #import "SentryError.h"
 #import "SentryMeta.h"
-#import "SentryOptionsHelpers.h"
+#import "SentryOptionsInternal.h"
 #import "SentrySwift.h"
 #import <XCTest/XCTest.h>
 
@@ -14,35 +14,35 @@ @implementation SentryDsnTests
 - (void)testMissingUsernamePassword
 {
     NSError *error = nil;
-    SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"https://sentry.io" }
-                                               didFailWithError:&error];
+    SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"https://sentry.io" }
+                                                didFailWithError:&error];
     XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
     XCTAssertNil(options);
 }
 
 - (void)testMissingScheme
 {
     NSError *error = nil;
-    SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"https://sentry.io" }
-                                               didFailWithError:&error];
+    SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"https://sentry.io" }
+                                                didFailWithError:&error];
     XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
     XCTAssertNil(options);
 }
 
 - (void)testMissingHost
 {
     NSError *error = nil;
-    SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"http:///1" }
-                                               didFailWithError:&error];
+    SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"http:///1" }
+                                                didFailWithError:&error];
     XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
     XCTAssertNil(options);
 }
 
 - (void)testUnsupportedProtocol
 {
     NSError *error = nil;
-    SentryOptions *options = [SentryOptionsHelpers initWithDict:@{ @"dsn" : @"ftp://sentry.io/1" }
-                                               didFailWithError:&error];
+    SentryOptions *options = [SentryOptionsInternal initWithDict:@{ @"dsn" : @"ftp://sentry.io/1" }
+                                                didFailWithError:&error];
     XCTAssertEqual(kSentryErrorInvalidDsnError, error.code);
     XCTAssertNil(options);
 }

Tests/SentryTests/Networking/SentryTransportInitializerTests.swift

@@ -24,7 +24,7 @@ class SentryTransportInitializerTests: XCTestCase {
     }
 
     func testDefault() throws {
-        let options = try SentryOptionsHelpers.initWithDict(["dsn": SentryTransportInitializerTests.dsnAsString])
+        let options = try SentryOptionsInternal.initWithDict(["dsn": SentryTransportInitializerTests.dsnAsString])
 
         let result = TransportInitializer.initTransports(
             options,