Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
686b6f8
fix: Fixes SentryScreenFrames use after being converted to Swift
itaybre Sep 8, 2025
07104dd
Merge branch 'main' into itay/fix_sentreyscreenframes
itaybre Oct 3, 2025
5a09e8e
Fix build
itaybre Oct 3, 2025
347a601
Merge branch 'main' into itay/fix_sentreyscreenframes
antonis Oct 14, 2025
7577a17
Use non-experimental enableLogs
denrase Oct 14, 2025
d3fe306
bump target
denrase Oct 14, 2025
3bd04c2
remove enable tracing
denrase Oct 14, 2025
cc596a8
Update enableLogs tests
denrase Oct 15, 2025
2b4c1d4
Merge branch 'main' into itay/fix_sentreyscreenframes
antonis Oct 17, 2025
d99584c
chore: Fix RNSentry after SentryFramesTracker conversion to swift
itaybre Oct 17, 2025
ca44d59
Run linter
itaybre Oct 17, 2025
4c0fb34
Remove unused debug image provider imports
noahsmartin Oct 18, 2025
d61ca6d
Remove imports
noahsmartin Oct 21, 2025
6a25cb9
chore: Remove deprecated user property
noahsmartin Oct 22, 2025
1bda802
chore: Remove use of deprecate integrations API (#5304)
noahsmartin Oct 24, 2025
0327771
Remove use of integrations in tests
noahsmartin Oct 27, 2025
80af135
chore: Remove use of deprecated prop (#5322)
noahsmartin Oct 31, 2025
b407fd2
ref: Move options to wrapper
noahsmartin Nov 6, 2025
914e943
Merge branch 'cocoa-v9' into itay/fix_sentreyscreenframes
antonis Nov 11, 2025
7633931
Merge branch 'itay/fix_sentreyscreenframes' into denrase/options-enab…
antonis Nov 11, 2025
076a651
Merge branch 'denrase/options-enable-logs' into itay/frames_tracker_s…
antonis Nov 11, 2025
98cd691
Merge branch 'cocoa-v9' into itay/frames_tracker_swift
antonis Nov 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>"; };
Expand All @@ -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 */

Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -140,6 +138,8 @@
FADF868E2EBD053E00D6652D /* SentrySDKWrapper.h */,
33AFE0132B8F31AF00AAB120 /* RNSentryDependencyContainer.h */,
338739072A7D7D2800950DDD /* RNSentryReplay.h */,
F48F26542EA2A481008A185E /* RNSentryEmitNewFrameEvent.h */,
F48F26552EA2A4D4008A185E /* RNSentryFramesTrackerListener.h */,
);
name = RNSentry;
sourceTree = "<group>";
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#import "RNSentryEmitNewFrameEvent.h"
#import "RNSentryOnDrawReporter.h"
#import <Foundation/Foundation.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ - (void)testCreateOptionsWithDictionaryEnableLogsDisabled

XCTAssertNotNil(actualOptions, @"Did not create sentry options");
XCTAssertNil(error, @"Should not pass no error");

BOOL enableLogs = [[actualOptions valueForKey:@"enableLogs"] boolValue];
XCTAssertFalse(enableLogs, @"enableLogs should be disabled");
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ios/RNSentry.mm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#endif

#if SENTRY_HAS_UIKIT
# import "RNSentryFramesTrackerListener.h"
# import "RNSentryEmitNewFrameEvent.h"
# import "RNSentryRNSScreen.h"
#endif

Expand Down
3 changes: 2 additions & 1 deletion packages/core/ios/RNSentryDependencyContainer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#import <Sentry/SentryDefines.h>

#import "RNSentryFramesTrackerListener.h"
#import "RNSentryEmitNewFrameEvent.h"
@class RNSentryFramesTrackerListener;

@interface RNSentryDependencyContainer : NSObject
SENTRY_NO_INIT
Expand Down
1 change: 1 addition & 0 deletions packages/core/ios/RNSentryDependencyContainer.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#import "RNSentryDependencyContainer.h"
#import "RNSentryFramesTrackerListener.h"
@import Sentry;

@implementation RNSentryDependencyContainer {
Expand Down
3 changes: 3 additions & 0 deletions packages/core/ios/RNSentryEmitNewFrameEvent.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#import <Foundation/Foundation.h>

typedef void (^RNSentryEmitNewFrameEvent)(NSNumber *newFrameTimestampInSeconds);
4 changes: 2 additions & 2 deletions packages/core/ios/RNSentryFramesTrackerListener.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

#if SENTRY_HAS_UIKIT

# import "RNSentryEmitNewFrameEvent.h"
# import <Foundation/Foundation.h>
# import <React/RCTEventEmitter.h>
# import <Sentry/SentryFramesTracker.h>

typedef void (^RNSentryEmitNewFrameEvent)(NSNumber *newFrameTimestampInSeconds);
@import Sentry;

@protocol RNSentryFramesTrackerListenerProtocol <SentryFramesTrackerListener>

Expand Down
2 changes: 2 additions & 0 deletions packages/core/ios/RNSentryFramesTrackerListener.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#if SENTRY_HAS_UIKIT

@import Sentry;

@implementation RNSentryFramesTrackerListener

- (instancetype)initWithSentryFramesTracker:(SentryFramesTracker *)framesTracker
Expand Down
3 changes: 2 additions & 1 deletion packages/core/ios/RNSentryOnDrawReporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

#if SENTRY_HAS_UIKIT

# import "RNSentryFramesTrackerListener.h"
# import <React/RCTViewManager.h>
# import <UIKit/UIKit.h>

@protocol RNSentryFramesTrackerListenerProtocol;

@interface RNSentryOnDrawReporter : RCTViewManager

@end
Expand Down
2 changes: 2 additions & 0 deletions packages/core/ios/RNSentryOnDrawReporter.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#import "RNSentryOnDrawReporter.h"
#import "RNSentryEmitNewFrameEvent.h"
#import "RNSentryFramesTrackerListener.h"
#import "RNSentryTimeToDisplay.h"
@import Sentry;

Expand Down
7 changes: 3 additions & 4 deletions packages/core/ios/RNSentryRNSScreen.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

#if SENTRY_HAS_UIKIT

# import <Sentry/SentryDependencyContainer.h>
# import <Sentry/SentryFramesTracker.h>
# import <Sentry/SentrySwizzle.h>

# import "RNSentryDependencyContainer.h"
# import "RNSentryFramesTrackerListener.h"
# import <Sentry/SentrySwizzle.h>
@import Sentry;

@implementation RNSentryRNSScreen

Expand Down
Loading