Skip to content

Commit 893d092

Browse files
committed
Merge branch 'main' into v8
# Conflicts: # CHANGELOG.md # 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 d4234fe + b1579bc commit 893d092

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

CHANGELOG.md

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

11+
### Dependencies
12+
13+
- Bump Cocoa SDK from v9.1.0 to v9.3.0 ([#5515](https://github.com/getsentry/sentry-react-native/pull/5515))
14+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#930)
15+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/9.1.0...9.3.0)
16+
17+
## 7.12.0
18+
1119
### Features
1220

1321
- Extends the experimental support of UI profiling to iOS ([#5611](https://github.com/getsentry/sentry-react-native/pull/5611))
@@ -51,9 +59,6 @@
5159

5260
### Dependencies
5361

54-
- Bump Cocoa SDK from v9.1.0 to v9.3.0 ([#5515](https://github.com/getsentry/sentry-react-native/pull/5515))
55-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#930)
56-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/9.1.0...9.3.0)
5762
- Bump JavaScript SDK from v10.37.0 to v10.38.0 ([#5596](https://github.com/getsentry/sentry-react-native/pull/5596))
5863
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10380)
5964
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.37.0...10.38.0)

samples/expo/app.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
"resizeMode": "contain",
1515
"backgroundColor": "#ffffff"
1616
},
17-
"assetBundlePatterns": ["**/*"],
17+
"assetBundlePatterns": [
18+
"**/*"
19+
],
1820
"ios": {
1921
"supportsTablet": true,
2022
"bundleIdentifier": "io.sentry.expo.sample",

0 commit comments

Comments
 (0)