Removes temporary flags after Cocoa Bump

.github/workflows/sample-application.yml

@@ -43,6 +43,7 @@ jobs:
         build-type: ['dev', 'production']
         include:
           - platform: ios
+            xcode-version: '16.2'
             runs-on: macos-14
           - platform: macos
             runs-on: macos-15
@@ -84,6 +85,9 @@ jobs:
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 
+      - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
+        if: ${{ matrix.platform == 'ios' }}
+
       - name: Setup Global Xcode Tools
         if: ${{ matrix.platform == 'ios' }}
         run: which xcbeautify || brew install xcbeautify

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift

@@ -67,11 +67,7 @@ final class RNSentryReplayOptions: XCTestCase {
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
         XCTAssertEqual(actualOptions.sessionReplay.sessionSampleRate, 0.75)
     }
 
@@ -82,11 +78,7 @@ final class RNSentryReplayOptions: XCTestCase {
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
         XCTAssertEqual(actualOptions.sessionReplay.onErrorSampleRate, 0.75)
     }
 
@@ -116,11 +108,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllImages, true)
         assertContainsClass(classArray: actualOptions.sessionReplay.maskedViewClasses, stringClass: "RCTImageView")
@@ -135,11 +123,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllImages, false)
         XCTAssertEqual(actualOptions.sessionReplay.maskedViewClasses.count, 0)
@@ -154,11 +138,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllText, true)
         assertContainsClass(classArray: actualOptions.sessionReplay.maskedViewClasses, stringClass: "RCTTextView")
@@ -182,11 +162,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllText, false)
         XCTAssertEqual(actualOptions.sessionReplay.maskedViewClasses.count, 0)
@@ -200,11 +176,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertTrue(actualOptions.sessionReplay.enableExperimentalViewRenderer)
     }
@@ -218,11 +190,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertTrue(actualOptions.sessionReplay.enableViewRendererV2)
     }
@@ -236,11 +204,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertFalse(actualOptions.sessionReplay.enableViewRendererV2)
     }
@@ -253,11 +217,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertFalse(actualOptions.sessionReplay.enableFastViewRendering)
     }
@@ -271,11 +231,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertTrue(actualOptions.sessionReplay.enableFastViewRendering)
     }
@@ -289,15 +245,11 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertFalse(actualOptions.sessionReplay.enableFastViewRendering)
     }
-    
+
     func testReplayQualityDefault() {
         let optionsDict = ([
             "dsn": "https://[email protected]/1234567",
@@ -306,11 +258,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }
@@ -324,11 +272,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.low)
     }
@@ -342,11 +286,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }
@@ -360,11 +300,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.high)
     }
@@ -378,11 +314,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        #if CROSS_PLATFORM_TEST
         let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
-        #else
-        let actualOptions = try! Options(dict: optionsDict as! [String: Any])
-        #endif
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h

@@ -3,12 +3,8 @@
 
 @class SentryOptions;
 
-#if CROSS_PLATFORM_TEST
 @interface
 SentrySDKInternal (PrivateTests)
-#else
-@interface
-SentrySDK (PrivateTests)
-#endif
+
 + (nullable SentryOptions *)options;
 @end

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m

@@ -465,13 +465,8 @@ - (void)prepareNativeFrameMocksWithLocalSymbolication:(BOOL)debug
     SentryOptions *sentryOptions = [[SentryOptions alloc] init];
     sentryOptions.debug = debug; // no local symbolication
 
-#if CROSS_PLATFORM_TEST
     id sentrySDKMock = OCMClassMock([SentrySDKInternal class]);
     OCMStub([(Class)sentrySDKMock options]).andReturn(sentryOptions);
-#else
-    id sentrySDKMock = OCMClassMock([SentrySDK class]);
-    OCMStub([(Class)sentrySDKMock options]).andReturn(sentryOptions);
-#endif
 
     id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
     OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))

packages/core/ios/RNSentry+fetchNativeStack.m

@@ -22,11 +22,8 @@
 - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
                                symbolicate:(SymbolicateCallbackType)symbolicate
 {
-#if CROSS_PLATFORM_TEST
     BOOL shouldSymbolicateLocally = [SentrySDKInternal.options debug];
-#else
-    BOOL shouldSymbolicateLocally = [SentrySDK.options debug];
-#endif
+
     NSString *appPackageName = [[NSBundle mainBundle] executablePath];
 
     NSMutableSet<NSString *> *_Nonnull imagesAddrToRetrieveDebugMetaImages =

packages/core/ios/RNSentry.h

@@ -15,12 +15,7 @@ typedef int (*SymbolicateCallbackType)(const void *, Dl_info *);
 @class SentryOptions;
 @class SentryEvent;
 
-#if CROSS_PLATFORM_TEST
 @interface SentrySDKInternal : NSObject
-#else
-@interface
-SentrySDK (Private)
-#endif
 @property (nonatomic, nullable, readonly, class) SentryOptions *options;
 @end
 

packages/core/ios/RNSentry.mm

@@ -28,16 +28,9 @@
 #import <Sentry/SentryException.h>
 #import <Sentry/SentryFormatter.h>
 #import <Sentry/SentryOptions.h>
-#import <Sentry/SentryUser.h>
-
-#if __has_include(<Sentry/SentryOptions+HybridSDKs.h>)
-#    define USE_SENTRY_OPTIONS 1
-#    import <Sentry/SentryOptions+HybridSDKs.h>
-#else
-#    define USE_SENTRY_OPTIONS 0
-#    import <Sentry/SentryOptionsInternal.h>
-#endif
+#import <Sentry/SentryOptionsInternal.h>
 #import <Sentry/SentryScreenFrames.h>
+#import <Sentry/SentryUser.h>
 
 // This guard prevents importing Hermes in JSC apps
 #if SENTRY_PROFILING_ENABLED
@@ -247,13 +240,8 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     [RNSentryReplay updateOptions:mutableOptions];
 #endif
 
-#if USE_SENTRY_OPTIONS
-    SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions
-                                                      didFailWithError:errorPointer];
-#else
     SentryOptions *sentryOptions = [SentryOptionsInternal initWithDict:mutableOptions
                                                       didFailWithError:errorPointer];
-#endif
     if (*errorPointer != nil) {
         return nil;
     }
@@ -467,11 +455,7 @@ - (void)stopObserving
             contexts[@"os"] = os;
         }
 
-#if CROSS_PLATFORM_TEST
         NSString *releaseName = SentrySDKInternal.options.releaseName;
-#else
-        NSString *releaseName = [SentrySDK options].releaseName;
-#endif
         if (releaseName) {
             contexts[@"release"] = releaseName;
         }

samples/react-native/ios/SentryNativeInitializer.h

@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+@interface SentryNativeInitializer : NSObject
+
++ (void)initializeSentry;
+
+@end

samples/react-native/ios/SentryNativeInitializer.m

@@ -0,0 +1,38 @@
+#import "SentryNativeInitializer.h"
+@import Sentry;
+
+@implementation SentryNativeInitializer
+
++ (void)initializeSentry
+{
+    [SentrySDK startWithConfigureOptions:^(SentryOptions *options) {
+        // Only options set here will apply to the iOS SDK
+        // Options from JS are not passed to the iOS SDK when initialized manually
+        options.dsn = @"https://[email protected]/5428561";
+        options.debug = YES; // Enabled debug when first installing is always helpful
+
+        options.beforeSend = ^SentryEvent *(SentryEvent *event)
+        {
+            // We don't want to send an event after startup that came from a Unhandled JS Exception
+            // of react native Because we sent it already before the app crashed.
+            if (nil != event.exceptions.firstObject.type &&
+                [event.exceptions.firstObject.type rangeOfString:@"Unhandled JS Exception"].location
+                    != NSNotFound) {
+                NSLog(@"Unhandled JS Exception");
+                return nil;
+            }
+
+            return event;
+        };
+
+        // Enable the App start and Frames tracking measurements
+        // If this is disabled the app start and frames tracking
+        // won't be passed from native to JS transactions
+        PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = true;
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
+        PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode = true;
+#endif
+    }];
+}
+
+@end