Merge branch 'main' into feat/maxCacheItems

getsentry · Mar 3, 2022 · 8ad0ca9 · 8ad0ca9
2 parents 1cfc624 + 221d270
commit 8ad0ca9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 - feat: Support setting maxCacheItems #2102
+- Bump: Sentry Cocoa 7.10.0 #2100
 
 ## 3.2.14-beta.2
 

diff --git 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', '7.9.0'
+  s.dependency 'Sentry', '7.10.0'
 
   s.source_files = 'ios/RNSentry.{h,m}'
   s.public_header_files = 'ios/RNSentry.h'

diff --git a/ios/RNSentry.m b/ios/RNSentry.m
@@ -68,8 +68,7 @@ + (BOOL)requiresMainQueueSetup {
     // remove performance traces sample rate and traces sampler since we don't want to synchronize these configurations
     // to the Native SDKs.
     // The user could tho initialize the SDK manually and set themselves.
-    // Remove comment below once https://github.com/getsentry/sentry-cocoa/issues/1657 gets fixed.
-    // [mutableOptions removeObjectForKey:@"tracesSampleRate"];
+    [mutableOptions removeObjectForKey:@"tracesSampleRate"];
     [mutableOptions removeObjectForKey:@"tracesSampler"];
 
     sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:&error];

diff --git a/sample/android/sentry.properties b/sample/android/sentry.properties
@@ -1,5 +1,4 @@
-defaults.url=https://sentry.io/
-defaults.org=sentry-test
-defaults.project=react-native
+#defaults.url=https://sentry.io/
+defaults.org=sentry-sdks
+defaults.project=sentry-react-native
 #auth.token=
-cli.executable=sentry-cli
diff --git a/sample/ios/sentry.properties b/sample/ios/sentry.properties
@@ -1,4 +1,4 @@
-defaults.url=https://sentry.io/
-defaults.org=sentry-test
-defaults.project=react-native
+#defaults.url=https://sentry.io/
+defaults.org=sentry-sdks
+defaults.project=sentry-react-native
 #auth.token=