From 92424473e4e6e572e6facfeab203326624ac2eb1 Mon Sep 17 00:00:00 2001 From: jennmueng Date: Thu, 12 Nov 2020 15:05:23 +0700 Subject: [PATCH 1/5] - build(ios): Bump `sentry-cocoa` to 6.0.8 --- CHANGELOG.md | 2 ++ RNSentry.podspec | 2 +- sample/ios/Podfile.lock | 14 +++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 861469925a..17ce06171c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- build(ios): Bump `sentry-cocoa` to 6.0.8 + ## 2.0.0 - build(android): Changes android package name from `io.sentry.RNSentryPackage` to `io.sentry.react.RNSentryPackage` (Breaking). #1131 diff --git a/RNSentry.podspec b/RNSentry.podspec index 856f05d328..0f578300a1 100644 --- a/RNSentry.podspec +++ b/RNSentry.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.preserve_paths = '*.js' s.dependency 'React-Core' - s.dependency 'Sentry', '~> 6.0.3' + s.dependency 'Sentry', '~> 6.0.8' s.source_files = 'ios/RNSentry.{h,m}' s.public_header_files = 'ios/RNSentry.h' diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index 874117b5c0..a2adfc5e3c 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -296,12 +296,12 @@ PODS: - React-Core (= 0.63.1) - React-cxxreact (= 0.63.1) - React-jsi (= 0.63.1) - - RNSentry (1.9.0): + - RNSentry (2.0.0): - React-Core - - Sentry (~> 6.0.3) - - Sentry (6.0.3): - - Sentry/Core (= 6.0.3) - - Sentry/Core (6.0.3) + - Sentry (~> 6.0.8) + - Sentry (6.0.8): + - Sentry/Core (= 6.0.8) + - Sentry/Core (6.0.8) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -465,8 +465,8 @@ SPEC CHECKSUMS: React-RCTText: 4f95d322b7e6da72817284abf8a2cdcec18b9cd8 React-RCTVibration: f3a9123c244f35c40d3c9f3ec3f0b9e5717bb292 ReactCommon: 2905859f84a94a381bb0d8dd3921ccb1a0047cb8 - RNSentry: 967713f6aac06484165449067160494529cb90d3 - Sentry: 286e33636e0be9b559e2ebe2eae63ec53f83816e + RNSentry: b03cee5511678074ca8e7755f366fed9db9ab48a + Sentry: 6ab9f44a413dec7ebf5e82b166048afb5f60b895 Yoga: d5bd05a2b6b94c52323745c2c2b64557c8c66f64 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a From 63b7aa2ac13494114529c9c19406135291e735df Mon Sep 17 00:00:00 2001 From: jennmueng Date: Thu, 12 Nov 2020 15:06:36 +0700 Subject: [PATCH 2/5] fix(ios): Remove private imports and call storeEnvelope on the client --- CHANGELOG.md | 1 + ios/RNSentry.m | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17ce06171c..8f23439a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - build(ios): Bump `sentry-cocoa` to 6.0.8 +- fix(ios): Remove private imports and call `storeEnvelope` on the client. ## 2.0.0 diff --git a/ios/RNSentry.m b/ios/RNSentry.m index c1b2554c76..ee79f9eaca 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.m @@ -7,8 +7,6 @@ #endif #import -#import -#import @interface RNSentry() @@ -148,7 +146,7 @@ + (BOOL)requiresMainQueueSetup { // Storing to disk happens asynchronously with captureEnvelope // We need to make sure the event is written to disk before resolving the promise. // This could be replaced by SentrySDK.flush() when available. - [[[[SentrySDK currentHub] getClient] fileManager] storeEnvelope:envelope]; + [[[SentrySDK currentHub] getClient] storeEnvelope:envelope]; } else { [[[SentrySDK currentHub] getClient] captureEnvelope: envelope]; } From 4092d27bed9f27ad6a33687fa9097763f1a8ea1a Mon Sep 17 00:00:00 2001 From: Jenn Mueng Date: Thu, 12 Nov 2020 16:53:15 +0700 Subject: [PATCH 3/5] fix: Lock specific version in podspec --- CHANGELOG.md | 1 + RNSentry.podspec | 2 +- sample/ios/Podfile.lock | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f23439a0a..3f8ba4774b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - build(ios): Bump `sentry-cocoa` to 6.0.8 - fix(ios): Remove private imports and call `storeEnvelope` on the client. +- fix(ios): Lock specific version in podspec. ## 2.0.0 diff --git a/RNSentry.podspec b/RNSentry.podspec index 0f578300a1..2407e26354 100644 --- a/RNSentry.podspec +++ b/RNSentry.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.preserve_paths = '*.js' s.dependency 'React-Core' - s.dependency 'Sentry', '~> 6.0.8' + s.dependency 'Sentry', '6.0.8' s.source_files = 'ios/RNSentry.{h,m}' s.public_header_files = 'ios/RNSentry.h' diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index a2adfc5e3c..bfa22a6eb2 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -298,7 +298,7 @@ PODS: - React-jsi (= 0.63.1) - RNSentry (2.0.0): - React-Core - - Sentry (~> 6.0.8) + - Sentry (= 6.0.8) - Sentry (6.0.8): - Sentry/Core (= 6.0.8) - Sentry/Core (6.0.8) @@ -465,11 +465,11 @@ SPEC CHECKSUMS: React-RCTText: 4f95d322b7e6da72817284abf8a2cdcec18b9cd8 React-RCTVibration: f3a9123c244f35c40d3c9f3ec3f0b9e5717bb292 ReactCommon: 2905859f84a94a381bb0d8dd3921ccb1a0047cb8 - RNSentry: b03cee5511678074ca8e7755f366fed9db9ab48a + RNSentry: 1c93d9d6b68748a6857d49e26c3e88fbe983caba Sentry: 6ab9f44a413dec7ebf5e82b166048afb5f60b895 Yoga: d5bd05a2b6b94c52323745c2c2b64557c8c66f64 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 9d75e167307300a63add2b53a03e1d19bb02cd35 -COCOAPODS: 1.9.3 +COCOAPODS: 1.9.2 From bb4ea965e7acf3538d9efcd6d88cc7c22abd58c6 Mon Sep 17 00:00:00 2001 From: Jenn Mueng Date: Thu, 12 Nov 2020 16:54:27 +0700 Subject: [PATCH 4/5] meta: Add PR tag --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f8ba4774b..c61c5fb7ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ ## Unreleased -- build(ios): Bump `sentry-cocoa` to 6.0.8 -- fix(ios): Remove private imports and call `storeEnvelope` on the client. -- fix(ios): Lock specific version in podspec. +- build(ios): Bump `sentry-cocoa` to 6.0.8. #1188 +- fix(ios): Remove private imports and call `storeEnvelope` on the client. #1188 +- fix(ios): Lock specific version in podspec. #1188 ## 2.0.0 From dcdcb395d9a679f0e034ed07656a08ea25ea999f Mon Sep 17 00:00:00 2001 From: Jenn Mueng <30991498+jennmueng@users.noreply.github.com> Date: Mon, 16 Nov 2020 20:34:52 +0700 Subject: [PATCH 5/5] ref: Remove space in ios/RNSentry.m Co-authored-by: Daniel Griesser --- ios/RNSentry.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNSentry.m b/ios/RNSentry.m index ee79f9eaca..da0488df0d 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.m @@ -148,7 +148,7 @@ + (BOOL)requiresMainQueueSetup { // This could be replaced by SentrySDK.flush() when available. [[[SentrySDK currentHub] getClient] storeEnvelope:envelope]; } else { - [[[SentrySDK currentHub] getClient] captureEnvelope: envelope]; + [[[SentrySDK currentHub] getClient] captureEnvelope:envelope]; } #endif resolve(@YES);