Skip to content

Commit 004387c

Browse files
authored
Merge branch 'v7' into lz/fiz-v7-ip
2 parents e20fc02 + ad7a627 commit 004387c

7 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/e2e-v2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
- platform: ios
174174
rn-version: '0.80.2'
175175
xcode-version: '16.2'
176-
runs-on: macos-15
176+
runs-on: macos-14
177177
- platform: ios
178178
rn-version: '0.65.3'
179179
xcode-version: '14.2'
@@ -310,10 +310,10 @@ jobs:
310310
include:
311311
- platform: ios
312312
rn-version: '0.80.2'
313-
runs-on: macos-15
313+
runs-on: macos-14
314314
- platform: ios
315315
rn-version: '0.65.3'
316-
runs-on: macos-15
316+
runs-on: macos-14
317317
- platform: android
318318
runs-on: ubuntu-latest
319319
exclude:

.github/workflows/native-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
test-ios:
2020
name: ios
21-
runs-on: macos-15
21+
runs-on: macos-14
2222
needs: [diff_check]
2323
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2424
steps:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ jobs:
3535
build-type: ['dev', 'production']
3636
include:
3737
- platform: ios
38-
runs-on: macos-15
38+
xcode-version: '16.2'
39+
runs-on: macos-14
3940
- platform: android
4041
runs-on: ubuntu-latest
4142
- platform: web
@@ -70,6 +71,9 @@ jobs:
7071
- name: Gradle cache
7172
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
7273

74+
- run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
75+
if: ${{ matrix.platform == 'ios' }}
76+
7377
- name: Setup Global Xcode Tools
7478
if: ${{ matrix.platform == 'ios' }}
7579
run: which xcbeautify || brew install xcbeautify

.github/workflows/sample-application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
build-type: ['dev', 'production']
4444
include:
4545
- platform: ios
46-
runs-on: macos-15
46+
runs-on: macos-14
4747
- platform: macos
4848
runs-on: macos-15
4949
- platform: android
@@ -218,7 +218,7 @@ jobs:
218218
matrix:
219219
include:
220220
- platform: ios
221-
runs-on: macos-15
221+
runs-on: macos-14
222222
rn-architecture: 'new'
223223
ios-use-frameworks: 'no-frameworks'
224224
build-type: 'production'

.github/workflows/testflight.yml

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

1515
upload_to_testflight:
1616
name: Build and Upload React Native Sample to Testflight
17-
runs-on: macos-15
17+
runs-on: macos-14
1818
needs: [diff_check]
1919
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2020
steps:

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ We apologize for any inconvenience caused!
3030

3131
### Dependencies
3232

33-
- Bump Android SDK from v8.17.0 to v8.19.0 ([#5034](https://github.com/getsentry/sentry-react-native/pull/5034), [#5063](https://github.com/getsentry/sentry-react-native/pull/5063))
34-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8190)
35-
- [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.19.0)
33+
- Bump Android SDK from v8.17.0 to v8.20.0 ([#5034](https://github.com/getsentry/sentry-react-native/pull/5034), [#5063](https://github.com/getsentry/sentry-react-native/pull/5063), [#5106](https://github.com/getsentry/sentry-react-native/pull/5106))
34+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8200)
35+
- [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.20.0)
3636

3737
## 7.0.0-rc.1
3838

packages/core/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ android {
5454

5555
dependencies {
5656
implementation 'com.facebook.react:react-native:+'
57-
api 'io.sentry:sentry-android:8.19.0'
57+
api 'io.sentry:sentry-android:8.20.0'
5858
}

0 commit comments

Comments
 (0)