Skip to content

Commit 46348ad

Browse files
antonisantonis
authored
Merge branch 'main' into antonis/rn-0.83.1
2 parents 5b01251 + 74979ac commit 46348ad

File tree

37 files changed

+698
-179
lines changed

37 files changed

+698
-179
lines changed

‎.github/workflows/changelog-preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ permissions:
1414

1515
jobs:
1616
changelog-preview:
17-
uses: getsentry/craft/.github/workflows/changelog-preview.yml@beea4aba589c66381258cbd131c5551ae8245b82 # V2
17+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@63d1636bead951f6e034ed62c2a3610965fef010 # V2
1818
secrets: inherit

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
47+
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2
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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
58+
uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2
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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
69+
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
cache-dependency-path: yarn.lock
4444

4545
- name: Prepare release
46-
uses: getsentry/craft@beea4aba589c66381258cbd131c5551ae8245b82 # v2
46+
uses: getsentry/craft@63d1636bead951f6e034ed62c2a3610965fef010 # v2
4747
env:
4848
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4949
with:

‎.github/workflows/sample-application-expo.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,24 @@ jobs:
4444
build-type: ['dev', 'production']
4545
include:
4646
- platform: ios
47-
xcode-version: '16.4'
48-
runs-on: macos-15
47+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
4948
- platform: android
50-
runs-on: ubuntu-latest
49+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
5150
- platform: web
52-
runs-on: ubuntu-latest
51+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
5352
exclude:
5453
- platform: 'android'
5554
ios-use-frameworks: 'dynamic-frameworks'
5655
steps:
5756
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5857

5958
- name: Enable Corepack
60-
run: npm i -g corepack
59+
run: corepack enable
60+
61+
- name: Install Ninja
62+
if: ${{ matrix.platform == 'android' }}
63+
run: sudo apt-get update && sudo apt-get install -y ninja-build
64+
6165
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
6266
with:
6367
package-manager-cache: false
@@ -81,9 +85,6 @@ jobs:
8185
- name: Gradle cache
8286
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
8387

84-
- run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
85-
if: ${{ matrix.platform == 'ios' }}
86-
8788
- name: Setup Global Xcode Tools
8889
if: ${{ matrix.platform == 'ios' }}
8990
run: which xcbeautify || brew install xcbeautify
@@ -137,6 +138,7 @@ jobs:
137138
-sdk 'iphonesimulator' \
138139
-destination 'generic/platform=iOS Simulator' \
139140
ONLY_ACTIVE_ARCH=yes \
141+
ARCHS=arm64 \
140142
-derivedDataPath "$derivedData" \
141143
build \
142144
| tee xcodebuild.log \

‎.github/workflows/sample-application.yml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ jobs:
5353
build-type: ['dev', 'production']
5454
include:
5555
- platform: ios
56-
xcode-version: '16.4'
57-
runs-on: macos-15
56+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
5857
- platform: macos
59-
runs-on: macos-15
58+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
6059
- platform: android
61-
runs-on: ubuntu-latest
60+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
6261
exclude:
6362
- platform: 'android'
6463
ios-use-frameworks: 'dynamic-frameworks'
@@ -72,7 +71,12 @@ jobs:
7271
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
7372

7473
- name: Enable Corepack
75-
run: npm i -g corepack
74+
run: corepack enable
75+
76+
- name: Install Ninja
77+
if: ${{ matrix.platform == 'android' }}
78+
run: sudo apt-get update && sudo apt-get install -y ninja-build
79+
7680
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
7781
with:
7882
package-manager-cache: false
@@ -96,11 +100,8 @@ jobs:
96100
- name: Gradle cache
97101
uses: gradle/gradle-build-action@v3
98102

99-
- run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
100-
if: ${{ matrix.platform == 'ios' }}
101-
102103
- name: Setup Global Xcode Tools
103-
if: ${{ matrix.platform == 'ios' }}
104+
if: ${{ matrix.platform == 'ios' || matrix.platform == 'macos' }}
104105
run: which xcbeautify || brew install xcbeautify
105106

106107
- name: Install SDK Dependencies
@@ -159,6 +160,7 @@ jobs:
159160
-sdk 'iphonesimulator' \
160161
-destination 'generic/platform=iOS Simulator' \
161162
ONLY_ACTIVE_ARCH=yes \
163+
ARCHS=arm64 \
162164
-derivedDataPath "$derivedData" \
163165
build \
164166
| tee xcodebuild.log \
@@ -251,6 +253,10 @@ jobs:
251253
with:
252254
version: ${{env.MAESTRO_VERSION}}
253255

256+
- name: Install Ninja
257+
if: ${{ matrix.platform == 'android' }}
258+
run: sudo apt-get update && sudo apt-get install -y ninja-build
259+
254260
- name: Download iOS App Archive
255261
if: ${{ matrix.platform == 'ios' }}
256262
uses: actions/download-artifact@v7
@@ -276,7 +282,8 @@ jobs:
276282
run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }}
277283

278284
- name: Enable Corepack
279-
run: npm i -g corepack
285+
run: corepack enable
286+
280287
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
281288
with:
282289
package-manager-cache: false

‎.github/workflows/testflight.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@ jobs:
1414

1515
upload_to_testflight:
1616
name: Build and Upload React Native Sample to Testflight
17-
runs-on: macos-15
17+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
1818
needs: [diff_check]
1919
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2020
steps:
2121
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
22-
- run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
2322
- uses: ruby/setup-ruby@v1
2423
with:
2524
working-directory: samples/react-native
2625
ruby-version: '3.3.0' # based on what is used in the sample
2726
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2827
cache-version: 1 # cache the installed gems
29-
- run: npm i -g corepack
28+
- run: corepack enable
3029
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
3130
with:
3231
package-manager-cache: false

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,42 @@
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+
### Features
12+
13+
- Add `autoCorrect` and `spellCheck` config options to `FeedbackWidget` ([#5627](https://github.com/getsentry/sentry-react-native/pull/5627))
14+
- Add `autoCapitalize="none"` to `FeedbackWidget` email input ([#5627](https://github.com/getsentry/sentry-react-native/pull/5627))
15+
16+
### Fixes
17+
18+
- Deep merge custom `styles` with defaults in `FeedbackWidget` instead of replacing them ([#5625](https://github.com/getsentry/sentry-react-native/pull/5625))
19+
- Note that partial style overrides now preserve default properties like padding and borders
20+
21+
### Dependencies
22+
23+
- Bump Android SDK from v8.31.0 to v8.32.0 ([#5633](https://github.com/getsentry/sentry-react-native/pull/5633))
24+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8320)
25+
- [diff](https://github.com/getsentry/sentry-java/compare/8.31.0...8.32.0)
26+
- Bump Android SDK Stubs from v8.31.0 to v8.32.0 ([#5634](https://github.com/getsentry/sentry-react-native/pull/5634))
27+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8320)
28+
- [diff](https://github.com/getsentry/sentry-java/compare/8.31.0...8.32.0)
29+
- Bump Bundler Plugins from v4.9.0 to v4.9.1 ([#5649](https://github.com/getsentry/sentry-react-native/pull/5649))
30+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#491)
31+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.9.0...4.9.1)
32+
33+
## 7.12.1
34+
35+
### Fixes
36+
37+
- Revert inputPaths to fix circular dependency build errors on iOS ([#5644](https://github.com/getsentry/sentry-react-native/pull/5644))
38+
939
## 7.12.0
1040

41+
> [!WARNING]
42+
> This release contains an issue that can cause iOS builds to fail with circular dependency errors.
43+
> See issue [#5641](https://github.com/getsentry/sentry-react-native/issues/5641) for more details.
44+
1145
### Features
1246

1347
- Extends the experimental support of UI profiling to iOS ([#5611](https://github.com/getsentry/sentry-react-native/pull/5611))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-e2e-tests",
3-
"version": "7.12.0",
3+
"version": "7.12.1",
44
"private": true,
55
"description": "Sentry React Native End to End Tests Library",
66
"main": "dist/index.js",
@@ -14,7 +14,7 @@
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
1616
"@sentry/core": "10.38.0",
17-
"@sentry/react-native": "7.12.0",
17+
"@sentry/react-native": "7.12.1",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",
2020
"appium": "2.4.1",

‎dev-packages/type-check/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sentry-react-native-type-check",
33
"private": true,
4-
"version": "7.12.0",
4+
"version": "7.12.1",
55
"scripts": {
66
"type-check": "./run-type-check.sh"
77
}

‎dev-packages/utils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-samples-utils",
3-
"version": "7.12.0",
3+
"version": "7.12.1",
44
"description": "Internal Samples Utils",
55
"main": "index.js",
66
"license": "MIT",

0 commit comments

Comments
 (0)