Skip to content

Commit 5a583a6

Browse files
committed
Merge branch 'main' into v7
# Conflicts: # .github/workflows/e2e-v2.yml # 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/plugin/src/withSentryAndroidGradlePlugin.ts # packages/core/src/js/integrations/sdkinfo.ts # packages/core/src/js/tools/sentryMetroSerializer.ts # packages/core/src/js/tools/utils.ts # packages/core/src/js/tools/vendor/metro/utils.ts # packages/core/src/js/tracing/timetodisplay.tsx # packages/core/src/js/version.ts # packages/core/test/integrations/sdkinfo.test.ts # packages/core/test/tracing/timetodisplay.test.tsx # 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 1254d56 + c1573b3 commit 5a583a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1280
-487
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @antonis @lucas-zimerman
1+
* @alwx @antonis @lucas-zimerman

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: '🐞 Bug Report'
22
description: "Tell us about something that's not working the way we (probably) intend."
3-
labels: ['Platform: React-Native', 'Type: 🪲 Bug']
4-
type: Bug
3+
labels: ['React-Native', 'Bug']
54
body:
65
- type: dropdown
76
id: environment
@@ -53,11 +52,11 @@ body:
5352
'Output of the command `npx react-native@latest info` or manully describe your development environment?'
5453
value: |-
5554
````
56-
⬇ Place the `npx react-native@latest info` output here. ⬇
57-
58-
59-
60-
55+
⬇ Place the `npx react-native@latest info` output here. ⬇
56+
57+
58+
59+
6160
````
6261
6362
- type: textarea

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: 💡 Feature Request
22
description: Tell us about a problem our SDK could solve but doesn't.
3-
labels: ['Platform: React-Native', 'enhancement']
4-
type: Feature
3+
labels: ['React-Native', 'Feature']
54
body:
65
- type: textarea
76
id: problem

.github/ISSUE_TEMPLATE/maintainer-blank.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Blank Issue
22
description: Blank Issue. Reserved for maintainers.
3-
labels: ["Platform: React-Native"]
3+
labels: ['React-Native']
44
body:
55
- type: textarea
66
id: description

.github/workflows/add-platform-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
steps:
1414
- uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # [email protected]
1515
with:
16-
add-labels: 'Platform: React-Native'
16+
add-labels: 'React-Native'
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/buildandtest.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
needs: [diff_check]
2323
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- run: npm i -g corepack
2727
- uses: actions/setup-node@v4
2828
with:
@@ -40,7 +40,7 @@ jobs:
4040
needs: [diff_check]
4141
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v5
4444
- run: npm i -g corepack
4545
- uses: actions/setup-node@v4
4646
with:
@@ -58,7 +58,7 @@ jobs:
5858
needs: [diff_check]
5959
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v5
6262
- run: npm i -g corepack
6363
- uses: actions/setup-node@v4
6464
with:
@@ -81,7 +81,7 @@ jobs:
8181
needs: [diff_check]
8282
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
8383
steps:
84-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v5
8585
- run: npm i -g corepack
8686
- uses: actions/setup-node@v4
8787
with:
@@ -124,7 +124,7 @@ jobs:
124124
env:
125125
YARN_ENABLE_IMMUTABLE_INSTALLS: false
126126
steps:
127-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v5
128128
- run: npm i -g corepack
129129
- uses: actions/setup-node@v4
130130
with:
@@ -134,12 +134,12 @@ jobs:
134134
- name: Install Dependencies
135135
run: yarn install
136136
- name: Download dist
137-
uses: actions/download-artifact@v4
137+
uses: actions/download-artifact@v5
138138
with:
139139
name: dist
140140
path: packages/core/dist
141141
- name: Download ts3.8
142-
uses: actions/download-artifact@v4
142+
uses: actions/download-artifact@v5
143143
with:
144144
name: ts3.8
145145
path: packages/core/ts3.8
@@ -154,7 +154,7 @@ jobs:
154154
needs: [job_build, diff_check]
155155
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
156156
steps:
157-
- uses: actions/checkout@v4
157+
- uses: actions/checkout@v5
158158
- run: npm i -g corepack
159159
- uses: actions/setup-node@v4
160160
with:
@@ -164,12 +164,12 @@ jobs:
164164
- name: Install Dependencies
165165
run: yarn install
166166
- name: Download dist
167-
uses: actions/download-artifact@v4
167+
uses: actions/download-artifact@v5
168168
with:
169169
name: dist
170170
path: packages/core/dist
171171
- name: Download Expo Plugin
172-
uses: actions/download-artifact@v4
172+
uses: actions/download-artifact@v5
173173
with:
174174
name: expo-plugin
175175
path: packages/core/plugin/build
@@ -188,7 +188,7 @@ jobs:
188188
platform: ['ios', 'android']
189189
dev: [true, false]
190190
steps:
191-
- uses: actions/checkout@v4
191+
- uses: actions/checkout@v5
192192
- run: npm i -g corepack
193193
- uses: actions/setup-node@v4
194194
with:

.github/workflows/changes-in-high-risk-code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
high_risk_code: ${{ steps.changes.outputs.high_risk_code }}
1717
high_risk_code_files: ${{ steps.changes.outputs.high_risk_code_files }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Get changed files
2121
id: changes
2222
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2

.github/workflows/codegen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
--outputPath codegen \
3737
--targetPlatform ios
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4040
- run: npm i -g corepack
4141
- uses: actions/setup-node@v4
4242
with:
4343
node-version: 18
4444
cache: 'yarn'
4545
cache-dependency-path: yarn.lock
46-
- uses: actions/setup-java@v4
46+
- uses: actions/setup-java@v5
4747
with:
4848
java-version: '17'
4949
distribution: "adopt"

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4
47+
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # [email protected].5
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4
58+
uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # [email protected].5
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
6666
# make bootstrap
6767
# make release
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4
69+
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # [email protected].5

.github/workflows/e2e-v2.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
17-
MAESTRO_VERSION: '1.41.0'
17+
MAESTRO_VERSION: '2.0.0'
1818
IOS_DEVICE: 'iPhone 16'
1919
IOS_VERSION: '18.1'
2020

@@ -48,7 +48,7 @@ jobs:
4848
name: Android
4949
appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
5252

5353
- uses: ./.github/actions/disk-cleanup
5454
if: ${{ matrix.platform == 'android' }}
@@ -63,7 +63,7 @@ jobs:
6363
cache: 'yarn'
6464
cache-dependency-path: yarn.lock
6565

66-
- uses: actions/setup-java@v4
66+
- uses: actions/setup-java@v5
6767
with:
6868
java-version: '17'
6969
distribution: "adopt"
@@ -163,15 +163,15 @@ jobs:
163163
strategy:
164164
fail-fast: false # keeps matrix running if one fails
165165
matrix:
166-
rn-version: ['0.65.3', '0.80.2']
166+
rn-version: ['0.65.3', '0.81.0']
167167
rn-architecture: ['legacy', 'new']
168168
platform: ['android', 'ios']
169169
build-type: ['production']
170170
ios-use-frameworks: ['no', 'static', 'dynamic']
171171
engine: ['hermes', 'jsc']
172172
include:
173173
- platform: ios
174-
rn-version: '0.80.2'
174+
rn-version: '0.81.0'
175175
xcode-version: '16.2'
176176
runs-on: macos-14
177177
- platform: ios
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-latest
183183
exclude:
184184
# exclude JSC for new RN versions (keeping the matrix manageable)
185-
- rn-version: '0.80.2'
185+
- rn-version: '0.81.0'
186186
engine: 'jsc'
187187
# exclude all rn versions lower than 0.70.0 for new architecture
188188
- rn-version: '0.65.3'
@@ -204,7 +204,7 @@ jobs:
204204
ios-use-frameworks: 'dynamic'
205205

206206
steps:
207-
- uses: actions/checkout@v4
207+
- uses: actions/checkout@v5
208208

209209
- uses: ./.github/actions/disk-cleanup
210210
if: ${{ matrix.platform == 'android' }}
@@ -234,7 +234,7 @@ jobs:
234234
cache: 'yarn'
235235
cache-dependency-path: yarn.lock
236236

237-
- uses: actions/setup-java@v4
237+
- uses: actions/setup-java@v5
238238
with:
239239
java-version: ${{ matrix.rn-version == '0.65.3' && '11' || '17' }}
240240
distribution: 'adopt'
@@ -301,15 +301,15 @@ jobs:
301301
strategy:
302302
fail-fast: false # keeps matrix running if one fails
303303
matrix:
304-
rn-version: ['0.65.3', '0.80.2']
304+
rn-version: ['0.65.3', '0.81.0']
305305
rn-architecture: ['legacy', 'new']
306306
platform: ['android', 'ios']
307307
build-type: ['production']
308308
ios-use-frameworks: ['no'] # test only no framworks
309309
engine: ['hermes', 'jsc']
310310
include:
311311
- platform: ios
312-
rn-version: '0.80.2'
312+
rn-version: '0.81.0'
313313
runs-on: macos-14
314314
- platform: ios
315315
rn-version: '0.65.3'
@@ -323,11 +323,11 @@ jobs:
323323
# e2e test only the default combinations
324324
- rn-version: '0.65.3'
325325
engine: 'hermes'
326-
- rn-version: '0.80.2'
326+
- rn-version: '0.81.0'
327327
engine: 'jsc'
328328

329329
steps:
330-
- uses: actions/checkout@v4
330+
- uses: actions/checkout@v5
331331

332332
- name: Install Maestro
333333
uses: dniHze/maestro-test-action@bda8a93211c86d0a05b7a4597c5ad134566fbde4 # [email protected]
@@ -347,7 +347,7 @@ jobs:
347347

348348
- name: Download App Package
349349
if: matrix.build-type == 'production'
350-
uses: actions/download-artifact@v4
350+
uses: actions/download-artifact@v5
351351
with:
352352
name: ${{ matrix.rn-version }}-${{ matrix.rn-architecture }}-${{ matrix.engine }}-${{ matrix.platform }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks }}-app-package
353353
path: dev-packages/e2e-tests
@@ -360,7 +360,7 @@ jobs:
360360
cache: 'yarn'
361361
cache-dependency-path: yarn.lock
362362

363-
- uses: actions/setup-java@v4
363+
- uses: actions/setup-java@v5
364364
with:
365365
java-version: '17'
366366
distribution: 'adopt'

0 commit comments

Comments
 (0)