diff --git a/CHANGELOG.md b/CHANGELOG.md index 6030ae5a36..66a4c1e425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,9 +50,21 @@ Access to Mobile Replay is limited to early access orgs on Sentry. If you're int - Bump CLI from v2.30.4 to v2.31.2 ([#3719](https://github.com/getsentry/sentry-react-native/pull/3719)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2312) - [diff](https://github.com/getsentry/sentry-cli/compare/2.30.4...2.31.2) -- Bump Cocoa SDK from v8.25.0 to v8.25.2 ([#3802](https://github.com/getsentry/sentry-react-native/pull/3802)) - - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8252) - - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.25.0...8.25.2) +- Bump Cocoa SDK from v8.26.0 to v8.27.0 ([#3858](https://github.com/getsentry/sentry-react-native/pull/3858)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8270) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.26.0...8.27.0) + +## 5.22.3 + +### Fixes + +- Missing `RNSentryOnDrawReporterView` on iOS ([#3832](https://github.com/getsentry/sentry-react-native/pull/3832)) + +### Dependencies + +- Bump Cocoa SDK from v8.25.0 to v8.26.0 ([#3802](https://github.com/getsentry/sentry-react-native/pull/3802), [#3815](https://github.com/getsentry/sentry-react-native/pull/3815)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8260) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.25.0...8.26.0) ## 5.22.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 66ed0e6cd7..e43b2c4da9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -113,7 +113,7 @@ Comment out sentry dependency in `RNSentry.podspec`. ```diff - s.dependency 'Sentry/HybridSDK', '7.31.0' -+ # s.dependency 'Sentry/HybridSDK', '7.31.0' ++ s.dependency 'Sentry/HybridSDK' ``` Add local pods to `sample/ios/Podfile`. @@ -123,9 +123,7 @@ target 'sample' do # ... react native config -+ pod 'Sentry/HybridSDK', :path => '../../../sentry-cocoa' -+ pod 'SentryPrivate', :path => '../../../sentry-cocoa/SentryPrivate.podspec' - + pod 'Sentry/HybridSDK', :path => '../../../../sentry-cocoa' # ... rest of the configuration end @@ -151,12 +149,12 @@ cd sentry-react-native/sample Add local maven to `sample/android/build.gradle`. -```diff -+ allprojects { -+ repositories { -+ mavenLocal() -+ } -+ } +```gradle +allprojects { + repositories { + mavenLocal() + } +} ``` Update `sentry-android` version, to the one locally published, in `android/build.gradle`. diff --git a/RNSentry.podspec b/RNSentry.podspec index 3560f8ef8d..393a8f6171 100644 --- a/RNSentry.podspec +++ b/RNSentry.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.preserve_paths = '*.js' s.dependency 'React-Core' - s.dependency 'Sentry/HybridSDK', '8.25.0-alpha.0' + s.dependency 'Sentry/HybridSDK', '8.27.0' s.source_files = 'ios/**/*.{h,m,mm}' s.public_header_files = 'ios/RNSentry.h' diff --git a/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj b/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj index a71ea9ab91..dc1b56e0b3 100644 --- a/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj +++ b/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 33958C692BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33958C682BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m */; }; 33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */; }; 33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */; }; 33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33F58ACF2977037D008F60EA /* RNSentryTests.mm */; }; @@ -17,6 +18,8 @@ 1482D5685A340AB93348A43D /* Pods-RNSentryCocoaTesterTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNSentryCocoaTesterTests.release.xcconfig"; path = "Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests.release.xcconfig"; sourceTree = ""; }; 3360898D29524164007C7730 /* RNSentryCocoaTesterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNSentryCocoaTesterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 338739072A7D7D2800950DDD /* RNSentryTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryTests.h; sourceTree = ""; }; + 33958C672BFCEF5A00AD1FB6 /* RNSentryOnDrawReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryOnDrawReporter.h; path = ../ios/RNSentryOnDrawReporter.h; sourceTree = ""; }; + 33958C682BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryOnDrawReporterTests.m; sourceTree = ""; }; 33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryFramesTrackerListenerTests.m; sourceTree = ""; }; 33AFDFEE2B8D14C200AAB120 /* RNSentryFramesTrackerListenerTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryFramesTrackerListenerTests.h; sourceTree = ""; }; 33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryDependencyContainerTests.m; sourceTree = ""; }; @@ -76,6 +79,7 @@ 33AFDFEE2B8D14C200AAB120 /* RNSentryFramesTrackerListenerTests.h */, 33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */, 33AFDFF22B8D15F600AAB120 /* RNSentryDependencyContainerTests.h */, + 33958C682BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m */, ); path = RNSentryCocoaTesterTests; sourceTree = ""; @@ -83,6 +87,7 @@ 33AFE0122B8F319000AAB120 /* RNSentry */ = { isa = PBXGroup; children = ( + 33958C672BFCEF5A00AD1FB6 /* RNSentryOnDrawReporter.h */, 33AFE0132B8F31AF00AAB120 /* RNSentryDependencyContainer.h */, ); name = RNSentry; @@ -198,6 +203,7 @@ files = ( 33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */, 33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */, + 33958C692BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m in Sources */, 33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m b/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m new file mode 100644 index 0000000000..022dc89951 --- /dev/null +++ b/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m @@ -0,0 +1,16 @@ +#import +#import "RNSentryOnDrawReporter.h" + +@interface RNSentryOnDrawReporterTests : XCTestCase + +@end + +@implementation RNSentryOnDrawReporterTests + +- (void)testRNSentryOnDrawReporterViewIsAvailableWhenUIKitIs +{ + RNSentryOnDrawReporterView* view = [[RNSentryOnDrawReporterView alloc] init]; + XCTAssertNotNil(view); +} + +@end diff --git a/ios/RNSentryOnDrawReporter.h b/ios/RNSentryOnDrawReporter.h new file mode 100644 index 0000000000..5a2585dc96 --- /dev/null +++ b/ios/RNSentryOnDrawReporter.h @@ -0,0 +1,23 @@ +#import + +#if SENTRY_HAS_UIKIT + +#import +#import +#import "RNSentryFramesTrackerListener.h" + +@interface RNSentryOnDrawReporter : RCTViewManager + +@end + +@interface RNSentryOnDrawReporterView : UIView + +@property (nonatomic, strong) RNSentryFramesTrackerListener* framesListener; +@property (nonatomic, copy) RCTBubblingEventBlock onDrawNextFrame; +@property (nonatomic) bool fullDisplay; +@property (nonatomic) bool initialDisplay; +@property (nonatomic, weak) RNSentryOnDrawReporter* delegate; + +@end + +#endif diff --git a/ios/RNSentryOnDrawReporter.m b/ios/RNSentryOnDrawReporter.m index 19042330b0..b6f4cabfdc 100644 --- a/ios/RNSentryOnDrawReporter.m +++ b/ios/RNSentryOnDrawReporter.m @@ -1,24 +1,9 @@ +#import "RNSentryOnDrawReporter.h" + #if SENTRY_HAS_UIKIT -#import -#import -#import "RNSentryFramesTrackerListener.h" #import -@interface RNSentryOnDrawReporter : RCTViewManager - -@end - -@interface RNSentryOnDrawReporterView : UIView - -@property (nonatomic, strong) RNSentryFramesTrackerListener* framesListener; -@property (nonatomic, copy) RCTBubblingEventBlock onDrawNextFrame; -@property (nonatomic) bool fullDisplay; -@property (nonatomic) bool initialDisplay; -@property (nonatomic, weak) RNSentryOnDrawReporter* delegate; - -@end - @implementation RNSentryOnDrawReporter RCT_EXPORT_MODULE(RNSentryOnDrawReporter)