Skip to content

Commit 232bf39

Browse files
antonisantonis
committed
Merge branch 'main' into capture-app-start-errors-v7
2 parents 37325ad + 70250df commit 232bf39

File tree

7 files changed

+107
-95
lines changed

7 files changed

+107
-95
lines changed

‎.github/workflows/e2e-v2.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
env:
1717
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
1818
MAESTRO_VERSION: '2.0.10'
19-
IOS_DEVICE: 'iPhone 16'
19+
IOS_DEVICE: 'iPhone 17'
2020
IOS_VERSION: '>=18.0'
2121

2222
jobs:
@@ -47,7 +47,7 @@ jobs:
4747
platform: ["ios", "android"]
4848
include:
4949
- platform: ios
50-
runs-on: macos-15
50+
runs-on: macos-26
5151
name: iOS
5252
appPlain: performance-tests/test-app-plain.ipa
5353
- platform: android
@@ -61,7 +61,7 @@ jobs:
6161
- uses: ./.github/actions/disk-cleanup
6262
if: ${{ matrix.platform == 'android' }}
6363

64-
- run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
64+
- run: sudo xcode-select -s /Applications/Xcode_26.1.1.app/Contents/Developer
6565
if: ${{ matrix.platform == 'ios' }}
6666

6767
- run: npm i -g corepack
@@ -186,9 +186,16 @@ jobs:
186186
ios-use-frameworks: ['no', 'static', 'dynamic']
187187
engine: ['hermes', 'jsc']
188188
include:
189+
# Use Xcode 16 for older RN versions
189190
- platform: ios
191+
rn-version: '0.71.19'
190192
xcode-version: '16.4'
191193
runs-on: macos-15
194+
# Use Xcode 26 for newer RN versions (0.83.0)
195+
- platform: ios
196+
rn-version: '0.83.0'
197+
xcode-version: '26.1.1'
198+
runs-on: macos-26
192199
- platform: android
193200
runs-on: ubuntu-latest
194201
exclude:
@@ -270,16 +277,13 @@ jobs:
270277
- name: Install JS Dependencies
271278
run: yarn install
272279

273-
- name: Setup Plain RN ${{ matrix.rn-version }} App
274-
run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --create
275-
276280
- uses: ruby/setup-ruby@v1
277281
if: ${{ matrix.platform == 'ios' }}
278282
with:
279-
working-directory: dev-packages/e2e-tests/react-native-versions/${{ matrix.rn-version }}/RnDiffApp
280-
ruby-version: '3.3.0' # based on what is used in the sample
281-
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
282-
cache-version: 1 # cache the installed gems
283+
ruby-version: '3.3.0'
284+
285+
- name: Setup Plain RN ${{ matrix.rn-version }} App
286+
run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --create
283287

284288
- name: Build Plain RN ${{ matrix.rn-version }} App
285289
run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --build
@@ -319,7 +323,7 @@ jobs:
319323
include:
320324
- platform: ios
321325
rn-version: '0.83.0'
322-
runs-on: macos-15
326+
runs-on: macos-26
323327
- platform: android
324328
runs-on: ubuntu-latest
325329

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
77
<!-- prettier-ignore-end -->
88
9+
## Unreleased
10+
11+
### Dependencies
12+
13+
- Bump JavaScript SDK from v10.30.0 to v10.31.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480))
14+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10310)
15+
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.31.0)
16+
917
## 7.8.0
1018

1119
### Features

‎dev-packages/e2e-tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
16-
"@sentry/core": "10.30.0",
16+
"@sentry/core": "10.31.0",
1717
"@sentry/react-native": "7.8.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",

‎packages/core/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
},
7070
"dependencies": {
7171
"@sentry/babel-plugin-component-annotate": "4.6.1",
72-
"@sentry/browser": "10.30.0",
72+
"@sentry/browser": "10.31.0",
7373
"@sentry/cli": "2.58.4",
74-
"@sentry/core": "10.30.0",
75-
"@sentry/react": "10.30.0",
76-
"@sentry/types": "10.30.0"
74+
"@sentry/core": "10.31.0",
75+
"@sentry/react": "10.31.0",
76+
"@sentry/types": "10.31.0"
7777
},
7878
"devDependencies": {
7979
"@babel/core": "^7.26.7",
8080
"@expo/metro-config": "~0.20.0",
8181
"@mswjs/interceptors": "^0.25.15",
8282
"@react-native/babel-preset": "0.80.0",
83-
"@sentry-internal/eslint-config-sdk": "10.30.0",
84-
"@sentry-internal/eslint-plugin-sdk": "10.30.0",
85-
"@sentry-internal/typescript": "10.30.0",
83+
"@sentry-internal/eslint-config-sdk": "10.31.0",
84+
"@sentry-internal/eslint-plugin-sdk": "10.31.0",
85+
"@sentry-internal/typescript": "10.31.0",
8686
"@sentry/wizard": "6.9.0",
8787
"@testing-library/react-native": "^13.2.2",
8888
"@types/jest": "^29.5.13",

‎samples/react-native-macos/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"@react-navigation/bottom-tabs": "^6.5.12",
1717
"@react-navigation/native": "^6.1.9",
1818
"@react-navigation/stack": "^6.3.20",
19-
"@sentry/core": "10.30.0",
20-
"@sentry/react": "10.30.0",
19+
"@sentry/core": "10.31.0",
20+
"@sentry/react": "10.31.0",
2121
"@sentry/react-native": "7.8.0",
2222
"delay": "^6.0.0",
2323
"react": "18.2.0",

‎samples/react-native/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"@react-navigation/native-stack": "^7.3.24",
4545
"@react-navigation/stack": "^7.4.5",
4646
"@reduxjs/toolkit": "^2.8.2",
47-
"@sentry/core": "10.30.0",
48-
"@sentry/react": "10.30.0",
47+
"@sentry/core": "10.31.0",
48+
"@sentry/react": "10.31.0",
4949
"@sentry/react-native": "7.8.0",
5050
"@shopify/flash-list": "^2.0.2",
5151
"delay": "^6.0.0",

‎yarn.lock‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -9529,21 +9529,21 @@ __metadata:
95299529
languageName: node
95309530
linkType: hard
95319531

9532-
"@sentry-internal/browser-utils@npm:10.30.0":
9533-
version: 10.30.0
9534-
resolution: "@sentry-internal/browser-utils@npm:10.30.0"
9532+
"@sentry-internal/browser-utils@npm:10.31.0":
9533+
version: 10.31.0
9534+
resolution: "@sentry-internal/browser-utils@npm:10.31.0"
95359535
dependencies:
9536-
"@sentry/core": 10.30.0
9537-
checksum: 8f6536c28da03ce622a9b7939b1cce9c319f740b94e361379d8cc98211303c4c8f0a98b40e77b709edf94b127ee0c8d3d433128a5c50999457d1a64aaea45689
9536+
"@sentry/core": 10.31.0
9537+
checksum: 7747ba4ab28d8256ed3f194ff9e31abf77fd196d702f0d2bd2038eaf0b59801340d923007b888521672e3ee01c484952467f7248a630c7185a2547e5b287e083
95389538
languageName: node
95399539
linkType: hard
95409540

9541-
"@sentry-internal/eslint-config-sdk@npm:10.30.0":
9542-
version: 10.30.0
9543-
resolution: "@sentry-internal/eslint-config-sdk@npm:10.30.0"
9541+
"@sentry-internal/eslint-config-sdk@npm:10.31.0":
9542+
version: 10.31.0
9543+
resolution: "@sentry-internal/eslint-config-sdk@npm:10.31.0"
95449544
dependencies:
9545-
"@sentry-internal/eslint-plugin-sdk": 10.30.0
9546-
"@sentry-internal/typescript": 10.30.0
9545+
"@sentry-internal/eslint-plugin-sdk": 10.31.0
9546+
"@sentry-internal/typescript": 10.31.0
95479547
"@typescript-eslint/eslint-plugin": ^5.62.0
95489548
"@typescript-eslint/parser": ^5.62.0
95499549
eslint-config-prettier: ^9.1.0
@@ -9553,43 +9553,43 @@ __metadata:
95539553
eslint-plugin-simple-import-sort: ^12.1.1
95549554
peerDependencies:
95559555
eslint: ">=5"
9556-
checksum: cdd0424bb1c5ddb0a4714381c53fb9c6bca6e13927792def252ae1e7e81e7505755e2228d863761ec025af7c7de31f401fd42595942b820285e780094d76941e
9556+
checksum: ebfbbee536d1c63909b812da01ce5892f75f34e676ecbe6281cd8f1a902e0c1a1dd5c7648fbd2e11b4580465a2caeb352b38ef1b34c78c465a8827000c6fa06e
95579557
languageName: node
95589558
linkType: hard
95599559

9560-
"@sentry-internal/eslint-plugin-sdk@npm:10.30.0":
9561-
version: 10.30.0
9562-
resolution: "@sentry-internal/eslint-plugin-sdk@npm:10.30.0"
9563-
checksum: 1d5ac41f7bc59845c1e9eba5cebb709b73bd42031ffc2725114b9d8464fbdaaa00236f699fb6719e31db4f7d771d3227b65dd7eb6d3586ffd98afc5872685196
9560+
"@sentry-internal/eslint-plugin-sdk@npm:10.31.0":
9561+
version: 10.31.0
9562+
resolution: "@sentry-internal/eslint-plugin-sdk@npm:10.31.0"
9563+
checksum: 057692f3531527c1990509e79c0cc7b74c1973be84ca0f8c8fb2311e2db55ae7d61a539ba4c919cbc87c1e910bc18b4c027d2cd1a5806f1fd4392ded9a8194b9
95649564
languageName: node
95659565
linkType: hard
95669566

9567-
"@sentry-internal/feedback@npm:10.30.0":
9568-
version: 10.30.0
9569-
resolution: "@sentry-internal/feedback@npm:10.30.0"
9567+
"@sentry-internal/feedback@npm:10.31.0":
9568+
version: 10.31.0
9569+
resolution: "@sentry-internal/feedback@npm:10.31.0"
95709570
dependencies:
9571-
"@sentry/core": 10.30.0
9572-
checksum: dda9147e8be6e33e84c9b02ed3db76a16d3a9b9f609b06873b9594ed4abbcfc077874776be26260e5fc3fd4153872c8aef7ee0adc898f708b764a412d54eff94
9571+
"@sentry/core": 10.31.0
9572+
checksum: bc7a641549a48b4defa872f151c486cf72055124646b440fd2cb9beed77893840e2973c79171e083aaa44f9e0cd7cbd5526d234ac145d386a958e536ace3da7d
95739573
languageName: node
95749574
linkType: hard
95759575

9576-
"@sentry-internal/replay-canvas@npm:10.30.0":
9577-
version: 10.30.0
9578-
resolution: "@sentry-internal/replay-canvas@npm:10.30.0"
9576+
"@sentry-internal/replay-canvas@npm:10.31.0":
9577+
version: 10.31.0
9578+
resolution: "@sentry-internal/replay-canvas@npm:10.31.0"
95799579
dependencies:
9580-
"@sentry-internal/replay": 10.30.0
9581-
"@sentry/core": 10.30.0
9582-
checksum: d1843ba130569890944113a3dbb4ad090d2b013ee78da1d75df7b125f775400dbd663d9c6a64c7dd3ed9917268d6c009f570ddf387ea943fa48d76587ee773a7
9580+
"@sentry-internal/replay": 10.31.0
9581+
"@sentry/core": 10.31.0
9582+
checksum: 544660c16158a8d929853149cde2a05b2a685502865b49e6c6ca382c5529d9f999a6a30f772a3ceb42871f436d3bcc5186ec1784f807b16dff0a4f5f17f579c8
95839583
languageName: node
95849584
linkType: hard
95859585

9586-
"@sentry-internal/replay@npm:10.30.0":
9587-
version: 10.30.0
9588-
resolution: "@sentry-internal/replay@npm:10.30.0"
9586+
"@sentry-internal/replay@npm:10.31.0":
9587+
version: 10.31.0
9588+
resolution: "@sentry-internal/replay@npm:10.31.0"
95899589
dependencies:
9590-
"@sentry-internal/browser-utils": 10.30.0
9591-
"@sentry/core": 10.30.0
9592-
checksum: d53218f06903549c4949323505e109c529b4d99f6b74603a8bf59f2652d214a49e188c2a25a0dc8f25a89d61a0d38a64479cab8417b1a1497a37ba01df466bac
9590+
"@sentry-internal/browser-utils": 10.31.0
9591+
"@sentry/core": 10.31.0
9592+
checksum: fec42cd14f3c4feea75c06a1f9e15d6f266570a4f5c0f2224cfdae38a1a9e59c4a258925bdd71836f320d1a6c80dce376b589f5b962c9d59a73bae03c5ae2246
95939593
languageName: node
95949594
linkType: hard
95959595

@@ -9604,12 +9604,12 @@ __metadata:
96049604
languageName: node
96059605
linkType: hard
96069606

9607-
"@sentry-internal/typescript@npm:10.30.0":
9608-
version: 10.30.0
9609-
resolution: "@sentry-internal/typescript@npm:10.30.0"
9607+
"@sentry-internal/typescript@npm:10.31.0":
9608+
version: 10.31.0
9609+
resolution: "@sentry-internal/typescript@npm:10.31.0"
96109610
peerDependencies:
96119611
typescript: ~5.8.0
9612-
checksum: b03e5debd43209e3d6d29e063202c2d6dd9676226dedbde6453ea18eb4f740debb65ce39f99e2680b20652998bef087d98668c88bccc2d171ed23b0deb715553
9612+
checksum: 2cf3890b9201a95c09e18b9cd8d9a748c4ec2c5a5199496c2be6fb9a80ce6b8ec2c3dbbf9e3d842a54cd024e97f2676c1ac5a95b9852e2ae1659bc0b4e82f950
96139613
languageName: node
96149614
linkType: hard
96159615

@@ -9620,16 +9620,16 @@ __metadata:
96209620
languageName: node
96219621
linkType: hard
96229622

9623-
"@sentry/browser@npm:10.30.0":
9624-
version: 10.30.0
9625-
resolution: "@sentry/browser@npm:10.30.0"
9623+
"@sentry/browser@npm:10.31.0":
9624+
version: 10.31.0
9625+
resolution: "@sentry/browser@npm:10.31.0"
96269626
dependencies:
9627-
"@sentry-internal/browser-utils": 10.30.0
9628-
"@sentry-internal/feedback": 10.30.0
9629-
"@sentry-internal/replay": 10.30.0
9630-
"@sentry-internal/replay-canvas": 10.30.0
9631-
"@sentry/core": 10.30.0
9632-
checksum: 387e38a9eea62f65fb6f0b2ba63b5462096c5fea82901636b7b6be08d992615473f69945feb2b041e5c8fb0cc3f2db6617aed6703040c0a3d7a8bf59a435eaa8
9627+
"@sentry-internal/browser-utils": 10.31.0
9628+
"@sentry-internal/feedback": 10.31.0
9629+
"@sentry-internal/replay": 10.31.0
9630+
"@sentry-internal/replay-canvas": 10.31.0
9631+
"@sentry/core": 10.31.0
9632+
checksum: 82278a5652917e5951aa57b93e47c691ccbde7e5444beca54fea9b85e1f8be3e49ab5c4f9b1b31a164967a7405ecf613a6d502fe15c96123d419624dd3e8392c
96339633
languageName: node
96349634
linkType: hard
96359635

@@ -9729,10 +9729,10 @@ __metadata:
97299729
languageName: node
97309730
linkType: hard
97319731

9732-
"@sentry/core@npm:10.30.0":
9733-
version: 10.30.0
9734-
resolution: "@sentry/core@npm:10.30.0"
9735-
checksum: 47afe5b43873efb3bd9afdd8e475e2f70be1ba3fbab5043150215528bde5fed589509b80694374e7daf7cbe34ba1f715a4616f669552ade66e3bd76170847035
9732+
"@sentry/core@npm:10.31.0":
9733+
version: 10.31.0
9734+
resolution: "@sentry/core@npm:10.31.0"
9735+
checksum: 3cd2543b3f300a1a8fbce6710ea8a7e6c574d69307309cbc6e61d9dffe7ec5c7ba4012eedcd8c0d8af9863e37b4134adae864cbc07c0f0e858bfa25236929e2c
97369736
languageName: node
97379737
linkType: hard
97389738

@@ -9779,15 +9779,15 @@ __metadata:
97799779
"@expo/metro-config": ~0.20.0
97809780
"@mswjs/interceptors": ^0.25.15
97819781
"@react-native/babel-preset": 0.80.0
9782-
"@sentry-internal/eslint-config-sdk": 10.30.0
9783-
"@sentry-internal/eslint-plugin-sdk": 10.30.0
9784-
"@sentry-internal/typescript": 10.30.0
9782+
"@sentry-internal/eslint-config-sdk": 10.31.0
9783+
"@sentry-internal/eslint-plugin-sdk": 10.31.0
9784+
"@sentry-internal/typescript": 10.31.0
97859785
"@sentry/babel-plugin-component-annotate": 4.6.1
9786-
"@sentry/browser": 10.30.0
9786+
"@sentry/browser": 10.31.0
97879787
"@sentry/cli": 2.58.4
9788-
"@sentry/core": 10.30.0
9789-
"@sentry/react": 10.30.0
9790-
"@sentry/types": 10.30.0
9788+
"@sentry/core": 10.31.0
9789+
"@sentry/react": 10.31.0
9790+
"@sentry/types": 10.31.0
97919791
"@sentry/wizard": 6.9.0
97929792
"@testing-library/react-native": ^13.2.2
97939793
"@types/jest": ^29.5.13
@@ -9835,25 +9835,25 @@ __metadata:
98359835
languageName: unknown
98369836
linkType: soft
98379837

9838-
"@sentry/react@npm:10.30.0":
9839-
version: 10.30.0
9840-
resolution: "@sentry/react@npm:10.30.0"
9838+
"@sentry/react@npm:10.31.0":
9839+
version: 10.31.0
9840+
resolution: "@sentry/react@npm:10.31.0"
98419841
dependencies:
9842-
"@sentry/browser": 10.30.0
9843-
"@sentry/core": 10.30.0
9842+
"@sentry/browser": 10.31.0
9843+
"@sentry/core": 10.31.0
98449844
hoist-non-react-statics: ^3.3.2
98459845
peerDependencies:
98469846
react: ^16.14.0 || 17.x || 18.x || 19.x
9847-
checksum: 26a92dc045283134d4352e115a3ecdf45f1948194eb0a1e29d03d82ae4f20f16ea76b98693d2ee693f493e60ea5ca3327d7fbdf38b3360574fd7f5c267c6d9c0
9847+
checksum: 9ada684f982c22d323bbada7d9c7caee8626b2d2135a9e2b92011d35a391d70171d6319290ca53e957faccf14e20c640943f4a3133083e424dd8748c701917ec
98489848
languageName: node
98499849
linkType: hard
98509850

9851-
"@sentry/types@npm:10.30.0":
9852-
version: 10.30.0
9853-
resolution: "@sentry/types@npm:10.30.0"
9851+
"@sentry/types@npm:10.31.0":
9852+
version: 10.31.0
9853+
resolution: "@sentry/types@npm:10.31.0"
98549854
dependencies:
9855-
"@sentry/core": 10.30.0
9856-
checksum: bfad9e252b29cbdddf9571c0dffc8595cf7eae762f462e4de98d24d9644f9f24151d8c873a1fd1ebf4610b1d1bd8de447cdafe67b1780119869394d1862e3178
9855+
"@sentry/core": 10.31.0
9856+
checksum: 8764348f8b01d40a8134bafeb2e0d9308f6785d2f431b11cb304c30de64a951a0c5c55aee439df499260e7844c6557f208dbae3ccfc38bc238186bf3312c53fb
98579857
languageName: node
98589858
linkType: hard
98599859

@@ -28135,7 +28135,7 @@ __metadata:
2813528135
dependencies:
2813628136
"@babel/preset-env": ^7.25.3
2813728137
"@babel/preset-typescript": ^7.18.6
28138-
"@sentry/core": 10.30.0
28138+
"@sentry/core": 10.31.0
2813928139
"@sentry/react-native": 7.8.0
2814028140
"@types/node": ^20.9.3
2814128141
"@types/react": ^18.2.64
@@ -28203,8 +28203,8 @@ __metadata:
2820328203
"@react-navigation/bottom-tabs": ^6.5.12
2820428204
"@react-navigation/native": ^6.1.9
2820528205
"@react-navigation/stack": ^6.3.20
28206-
"@sentry/core": 10.30.0
28207-
"@sentry/react": 10.30.0
28206+
"@sentry/core": 10.31.0
28207+
"@sentry/react": 10.31.0
2820828208
"@sentry/react-native": 7.8.0
2820928209
"@types/react": ^18.2.65
2821028210
"@types/react-native-vector-icons": ^6.4.18
@@ -28253,8 +28253,8 @@ __metadata:
2825328253
"@react-navigation/stack": ^7.4.5
2825428254
"@reduxjs/toolkit": ^2.8.2
2825528255
"@sentry/babel-plugin-component-annotate": 4.6.1
28256-
"@sentry/core": 10.30.0
28257-
"@sentry/react": 10.30.0
28256+
"@sentry/core": 10.31.0
28257+
"@sentry/react": 10.31.0
2825828258
"@sentry/react-native": 7.8.0
2825928259
"@shopify/flash-list": ^2.0.2
2826028260
"@testing-library/react-native": ^13.2.2

0 commit comments

Comments
 (0)