chore: Move from using Hybrid SDK subspec to regular Sentry podspec

.github/workflows/buildandtest.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
       - release/**
   pull_request:
 

.github/workflows/codegen.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
       - release/**
   pull_request:
 

.github/workflows/e2e-v2.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
       - release/**
   pull_request:
     types: [opened, synchronize, reopened, labeled]

.github/workflows/native-tests.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
       - release/**
   pull_request:
     types: [opened, synchronize, reopened, labeled]

.github/workflows/sample-application-expo.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
   pull_request:
     types: [opened, synchronize, reopened, labeled]
 

.github/workflows/sample-application.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v5
   pull_request:
     types: [opened, synchronize, reopened, labeled]
 

CHANGELOG.md

@@ -10,6 +10,9 @@
 
 ### Dependencies
 
+- Bump Cocoa SDK from v8.57.3 to v9.1.0 ([#5356](https://github.com/getsentry/sentry-react-native/pull/5356))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#910)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.3...9.1.0)
 - Bump JavaScript SDK from v10.30.0 to v10.31.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480))
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10310)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.31.0)

CONTRIBUTING.md

@@ -136,8 +136,8 @@ cd sentry-react-native
 Comment out sentry dependency in `RNSentry.podspec`.
 
 ```diff
--   s.dependency 'Sentry/HybridSDK', '7.31.0'
-+   s.dependency 'Sentry/HybridSDK'
+-   s.dependency 'Sentry', '7.31.0'
++   s.dependency 'Sentry'
 ```
 
 Add local pods to `sample/ios/Podfile`.
@@ -147,7 +147,7 @@ target 'sample' do
 
   # ... react native config
 
- pod 'Sentry/HybridSDK', :path => '../../../../sentry-cocoa'
+ pod 'Sentry', :path => '../../../../sentry-cocoa'
   # ... rest of the configuration
 
 end

packages/core/RNSentry.podspec

@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.57.3'
+  s.dependency 'Sentry', '>= 9.1.0'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj

@@ -40,9 +40,7 @@
 		338739072A7D7D2800950DDD /* RNSentryReplay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNSentryReplay.h; path = ../ios/RNSentryReplay.h; sourceTree = "<group>"; };
 		33958C672BFCEF5A00AD1FB6 /* RNSentryOnDrawReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryOnDrawReporter.h; path = ../ios/RNSentryOnDrawReporter.h; sourceTree = "<group>"; };
 		33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryFramesTrackerListenerTests.m; sourceTree = "<group>"; };
-		33AFDFEE2B8D14C200AAB120 /* RNSentryFramesTrackerListenerTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryFramesTrackerListenerTests.h; sourceTree = "<group>"; };
 		33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryDependencyContainerTests.m; sourceTree = "<group>"; };
-		33AFDFF22B8D15F600AAB120 /* RNSentryDependencyContainerTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryDependencyContainerTests.h; sourceTree = "<group>"; };
 		33AFE0132B8F31AF00AAB120 /* RNSentryDependencyContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryDependencyContainer.h; path = ../ios/RNSentryDependencyContainer.h; sourceTree = "<group>"; };
 		33DEDFE92D8DBE5B006066E4 /* RNSentryOnDrawReporterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNSentryOnDrawReporterTests.swift; sourceTree = "<group>"; };
 		33DEDFEB2D8DC800006066E4 /* RNSentryOnDrawReporter+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNSentryOnDrawReporter+Test.h"; sourceTree = "<group>"; };
@@ -52,6 +50,8 @@
 		33F58ACF2977037D008F60EA /* RNSentryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSentryTests.m; sourceTree = "<group>"; };
 		650CB718ACFBD05609BF2126 /* libPods-RNSentryCocoaTesterTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNSentryCocoaTesterTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E2321E7CFA55AB617247098E /* Pods-RNSentryCocoaTesterTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNSentryCocoaTesterTests.debug.xcconfig"; path = "Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests.debug.xcconfig"; sourceTree = "<group>"; };
+		F48F26542EA2A481008A185E /* RNSentryEmitNewFrameEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNSentryEmitNewFrameEvent.h; path = ../ios/RNSentryEmitNewFrameEvent.h; sourceTree = SOURCE_ROOT; };
+		F48F26552EA2A4D4008A185E /* RNSentryFramesTrackerListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNSentryFramesTrackerListener.h; path = ../ios/RNSentryFramesTrackerListener.h; sourceTree = SOURCE_ROOT; };
 		FADF868E2EBD053E00D6652D /* SentrySDKWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySDKWrapper.h; path = ../ios/SentrySDKWrapper.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -109,9 +109,7 @@
 				33F58ACF2977037D008F60EA /* RNSentryTests.m */,
 				3339C4802D6625570088EB3A /* RNSentryUserTests.m */,
 				33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */,
-				33AFDFEE2B8D14C200AAB120 /* RNSentryFramesTrackerListenerTests.h */,
 				33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */,
-				33AFDFF22B8D15F600AAB120 /* RNSentryDependencyContainerTests.h */,
 				3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */,
 				332D33462CDBDBB600547D76 /* RNSentryReplayOptionsTests.swift */,
 				3380C6C32CE25ECA0018B9B6 /* RNSentryReplayPostInitTests.swift */,
@@ -140,6 +138,8 @@
 				FADF868E2EBD053E00D6652D /* SentrySDKWrapper.h */,
 				33AFE0132B8F31AF00AAB120 /* RNSentryDependencyContainer.h */,
 				338739072A7D7D2800950DDD /* RNSentryReplay.h */,
+				F48F26542EA2A481008A185E /* RNSentryEmitNewFrameEvent.h */,
+				F48F26552EA2A4D4008A185E /* RNSentryFramesTrackerListener.h */,
 			);
 			name = RNSentry;
 			sourceTree = "<group>";
@@ -238,10 +238,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests-resources.sh\"\n";
@@ -436,7 +440,7 @@
 					"\"$(PODS_TARGET_SRCROOT)/include/\"",
 					"\"${PODS_ROOT}/Sentry/Sources/Sentry/include\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.sentry.RNSentryCocoaTesterTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -503,7 +507,7 @@
 					"\"$(PODS_TARGET_SRCROOT)/include/\"",
 					"\"${PODS_ROOT}/Sentry/Sources/Sentry/include\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.sentry.RNSentryCocoaTesterTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m

@@ -1,8 +1,8 @@
-#import "RNSentryDependencyContainerTests.h"
 #import "RNSentryDependencyContainer.h"
 #import <OCMock/OCMock.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
+@import Sentry;
 
 @interface RNSentryDependencyContainerTests : XCTestCase
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m

@@ -1,8 +1,9 @@
-#import "RNSentryFramesTrackerListenerTests.h"
 #import "RNSentryDependencyContainer.h"
+#import "RNSentryFramesTrackerListener.h"
 #import <OCMock/OCMock.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
+@import Sentry;
 
 @interface RNSentryFramesTrackerListenerTests : XCTestCase
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporter+Test.h

@@ -1,3 +1,4 @@
+#import "RNSentryEmitNewFrameEvent.h"
 #import "RNSentryOnDrawReporter.h"
 #import <Foundation/Foundation.h>
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift

@@ -67,7 +67,7 @@ final class RNSentryReplayOptions: XCTestCase {
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
         XCTAssertEqual(actualOptions.sessionReplay.sessionSampleRate, 0.75)
     }
 
@@ -78,7 +78,7 @@ final class RNSentryReplayOptions: XCTestCase {
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
         XCTAssertEqual(actualOptions.sessionReplay.onErrorSampleRate, 0.75)
     }
 
@@ -108,7 +108,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllImages, true)
         assertContainsClass(classArray: actualOptions.sessionReplay.maskedViewClasses, stringClass: "RCTImageView")
@@ -123,7 +123,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllImages, false)
         XCTAssertEqual(actualOptions.sessionReplay.maskedViewClasses.count, 0)
@@ -138,7 +138,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllText, true)
         assertContainsClass(classArray: actualOptions.sessionReplay.maskedViewClasses, stringClass: "RCTTextView")
@@ -162,7 +162,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.maskAllText, false)
         XCTAssertEqual(actualOptions.sessionReplay.maskedViewClasses.count, 0)
@@ -176,7 +176,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertTrue(actualOptions.sessionReplay.enableViewRendererV2)
     }
@@ -190,7 +190,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertTrue(actualOptions.sessionReplay.enableViewRendererV2)
     }
@@ -204,7 +204,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertFalse(actualOptions.sessionReplay.enableViewRendererV2)
     }
@@ -217,7 +217,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertFalse(actualOptions.sessionReplay.enableFastViewRendering)
     }
@@ -231,7 +231,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertTrue(actualOptions.sessionReplay.enableFastViewRendering)
     }
@@ -245,7 +245,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertFalse(actualOptions.sessionReplay.enableFastViewRendering)
     }
@@ -258,7 +258,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }
@@ -272,7 +272,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.low)
     }
@@ -286,7 +286,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }
@@ -300,7 +300,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.high)
     }
@@ -314,7 +314,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         RNSentryReplay.updateOptions(optionsDict)
 
-        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+        let actualOptions = try! PrivateSentrySDKOnly.options(with: optionsDict as! [String: Any])
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m

@@ -40,7 +40,6 @@ - (void)testCreateOptionsWithDictionaryRemovesPerformanceProperties
 XCTAssertEqual(
     actualOptions.tracesSampleRate, nil, @"Traces sample rate should not be passed to native");
 XCTAssertEqual(actualOptions.tracesSampler, nil, @"Traces sampler should not be passed to native");
-XCTAssertEqual(actualOptions.enableTracing, false, @"EnableTracing should not be passed to native");
 }
 
 - (void)testCaptureFailedRequestsIsDisabled
@@ -348,10 +347,7 @@ - (void)testCreateOptionsWithDictionaryEnableLogsEnabled
     XCTAssertNotNil(actualOptions, @"Did not create sentry options");
     XCTAssertNil(error, @"Should not pass no error");
 
-    id experimentalOptions = [actualOptions valueForKey:@"experimental"];
-    XCTAssertNotNil(experimentalOptions, @"Experimental options should not be nil");
-
-    BOOL enableLogs = [[experimentalOptions valueForKey:@"enableLogs"] boolValue];
+    BOOL enableLogs = [[actualOptions valueForKey:@"enableLogs"] boolValue];
     XCTAssertTrue(enableLogs, @"enableLogs should be enabled");
 }
 
@@ -370,11 +366,7 @@ - (void)testCreateOptionsWithDictionaryEnableLogsDisabled
 
     XCTAssertNotNil(actualOptions, @"Did not create sentry options");
     XCTAssertNil(error, @"Should not pass no error");
-
-    id experimentalOptions = [actualOptions valueForKey:@"experimental"];
-    XCTAssertNotNil(experimentalOptions, @"Experimental options should not be nil");
-
-    BOOL enableLogs = [[experimentalOptions valueForKey:@"enableLogs"] boolValue];
+    BOOL enableLogs = [[actualOptions valueForKey:@"enableLogs"] boolValue];
     XCTAssertFalse(enableLogs, @"enableLogs should be disabled");
 }
 

packages/core/ios/RNSentry+fetchNativeStack.m

@@ -1,4 +1,5 @@
 #import "RNSentry.h"
+#import "RNSentry+formatters.h"
 #import "RNSentryBreadcrumb.h"
 #import "RNSentryId.h"
 #import <Sentry/PrivateSentrySDKOnly.h>