From 97b16b72cc2970a9de89ff2903064a19879d2b8b Mon Sep 17 00:00:00 2001
From: Jenn Mueng <30991498+jennmueng@users.noreply.github.com>
Date: Mon, 16 Nov 2020 20:36:23 +0700
Subject: [PATCH] fix(ios): Bump sentry-cocoa to 6.0.8 and remove private
 imports  (#1188)

* - build(ios): Bump `sentry-cocoa` to 6.0.8

* fix(ios): Remove private imports and call storeEnvelope on the client

* fix: Lock specific version in podspec

* meta: Add PR tag

* ref: Remove space in ios/RNSentry.m

Co-authored-by: Daniel Griesser <daniel.griesser.86@gmail.com>

Co-authored-by: Daniel Griesser <daniel.griesser.86@gmail.com>
---
 CHANGELOG.md            |  4 ++++
 RNSentry.podspec        |  2 +-
 ios/RNSentry.m          |  6 ++----
 sample/ios/Podfile.lock | 16 ++++++++--------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 861469925a..c61c5fb7ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- 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
 
 - 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..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.3'
+  s.dependency 'Sentry', '6.0.8'
 
   s.source_files = 'ios/RNSentry.{h,m}'
   s.public_header_files = 'ios/RNSentry.h'
diff --git a/ios/RNSentry.m b/ios/RNSentry.m
index c1b2554c76..da0488df0d 100644
--- a/ios/RNSentry.m
+++ b/ios/RNSentry.m
@@ -7,8 +7,6 @@
 #endif
 
 #import <Sentry/Sentry.h>
-#import <Sentry/SentrySdkInfo.h>
-#import <Sentry/SentryFileManager.h>
 
 @interface RNSentry()
 
@@ -148,9 +146,9 @@ + (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];
+                [[[SentrySDK currentHub] getClient] captureEnvelope:envelope];
             }
         #endif
         resolve(@YES);
diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock
index 874117b5c0..bfa22a6eb2 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,11 +465,11 @@ SPEC CHECKSUMS:
   React-RCTText: 4f95d322b7e6da72817284abf8a2cdcec18b9cd8
   React-RCTVibration: f3a9123c244f35c40d3c9f3ec3f0b9e5717bb292
   ReactCommon: 2905859f84a94a381bb0d8dd3921ccb1a0047cb8
-  RNSentry: 967713f6aac06484165449067160494529cb90d3
-  Sentry: 286e33636e0be9b559e2ebe2eae63ec53f83816e
+  RNSentry: 1c93d9d6b68748a6857d49e26c3e88fbe983caba
+  Sentry: 6ab9f44a413dec7ebf5e82b166048afb5f60b895
   Yoga: d5bd05a2b6b94c52323745c2c2b64557c8c66f64
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 9d75e167307300a63add2b53a03e1d19bb02cd35
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.9.2