Skip to content

Commit 98a50eb

Browse files
committed
Merge branch 'main' into v8
# Conflicts: # dev-packages/e2e-tests/package.json # dev-packages/type-check/package.json # dev-packages/utils/package.json # lerna.json # packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java # packages/core/ios/RNSentryVersion.m # packages/core/package.json # packages/core/src/js/version.ts # performance-tests/TestAppPlain/package.json # performance-tests/TestAppSentry/package.json # samples/expo/app.json # samples/expo/package.json # samples/react-native-macos/package.json # samples/react-native/android/app/build.gradle # samples/react-native/ios/sentryreactnativesample/Info.plist # samples/react-native/ios/sentryreactnativesampleTests/Info.plist # samples/react-native/package.json # yarn.lock
2 parents e3f317a + 8a868fe commit 98a50eb

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

CHANGELOG.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@
88
99
## Unreleased
1010

11+
### Dependencies
12+
13+
- Bump CLI from v3.1.0 to v3.2.0 ([#5528](https://github.com/getsentry/sentry-react-native/pull/5528))
14+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#320)
15+
- [diff](https://github.com/getsentry/sentry-cli/compare/3.1.0...3.2.0)
16+
- Bump Cocoa SDK from v9.3.0 to v9.4.1 ([#5619](https://github.com/getsentry/sentry-react-native/pull/5619), [#5656](https://github.com/getsentry/sentry-react-native/pull/5656))
17+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#941)
18+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/9.3.0...9.4.1)
19+
20+
## 7.13.0
21+
1122
### Features
1223

1324
- Add `autoCorrect` and `spellCheck` config options to `FeedbackWidget` ([#5627](https://github.com/getsentry/sentry-react-native/pull/5627))
@@ -26,12 +37,6 @@
2637
- Bump Android SDK Stubs from v8.31.0 to v8.32.0 ([#5634](https://github.com/getsentry/sentry-react-native/pull/5634))
2738
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8320)
2839
- [diff](https://github.com/getsentry/sentry-java/compare/8.31.0...8.32.0)
29-
- Bump CLI from v3.1.0 to v3.2.0 ([#5528](https://github.com/getsentry/sentry-react-native/pull/5528))
30-
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#320)
31-
- [diff](https://github.com/getsentry/sentry-cli/compare/3.1.0...3.2.0)
32-
- Bump Cocoa SDK from v9.3.0 to v9.4.1 ([#5619](https://github.com/getsentry/sentry-react-native/pull/5619), [#5656](https://github.com/getsentry/sentry-react-native/pull/5656))
33-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#941)
34-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/9.3.0...9.4.1)
3540
- Bump Bundler Plugins from v4.9.0 to v4.9.1 ([#5649](https://github.com/getsentry/sentry-react-native/pull/5649))
3641
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#491)
3742
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.9.0...4.9.1)

samples/expo/app.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"ios": {
1919
"supportsTablet": true,
2020
"bundleIdentifier": "io.sentry.expo.sample",
21-
"buildNumber": "71"
21+
"buildNumber": "72"
2222
},
2323
"android": {
2424
"adaptiveIcon": {
2525
"foregroundImage": "./assets/adaptive-icon.png",
2626
"backgroundColor": "#ffffff"
2727
},
2828
"package": "io.sentry.expo.sample",
29-
"versionCode": 71
29+
"versionCode": 72
3030
},
3131
"web": {
3232
"bundler": "metro",

samples/react-native/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ android {
130130
applicationId "io.sentry.reactnative.sample"
131131
minSdkVersion rootProject.ext.minSdkVersion
132132
targetSdkVersion rootProject.ext.targetSdkVersion
133-
versionCode 73
133+
versionCode 74
134134
versionName "8.0.0-beta.0"
135135
buildConfigField "boolean", "SENTRY_DISABLE_NATIVE_START", System.getenv('SENTRY_DISABLE_NATIVE_START') ?: String.valueOf(sentryDisableNativeStart)
136136

samples/react-native/ios/sentryreactnativesample/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>
26-
<string>78</string>
26+
<string>79</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true />
2929
<key>NSAppTransportSecurity</key>

samples/react-native/ios/sentryreactnativesampleTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>78</string>
22+
<string>79</string>
2323
</dict>
2424
</plist>

0 commit comments

Comments
 (0)