From b42eea9dfd1160e752743f7550e0c33adb96e6df Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 22 Jul 2026 09:09:27 +0000 Subject: [PATCH 1/2] chore: update scripts/update-cocoa.sh to 9.22.0 --- CHANGELOG.md | 3 +++ packages/core/RNSentry.podspec | 2 +- packages/core/scripts/sentry_utils.rb | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b4f0ab52..cf802f98a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ - Bump CLI from v3.6.0 to v3.6.1 ([#6493](https://github.com/getsentry/sentry-react-native/pull/6493)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#361) - [diff](https://github.com/getsentry/sentry-cli/compare/3.6.0...3.6.1) +- Bump Cocoa SDK from v9.19.1 to v9.22.0 ([#6409](https://github.com/getsentry/sentry-react-native/pull/6409)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9220) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.19.1...9.22.0) ## 8.19.0 diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec index 0b6ee4e414..02974d7164 100644 --- a/packages/core/RNSentry.podspec +++ b/packages/core/RNSentry.podspec @@ -63,7 +63,7 @@ Pod::Spec.new do |s| 'DEFINES_MODULE' => 'YES' } - sentry_cocoa_version = '9.19.1' + sentry_cocoa_version = '9.22.0' # Consume sentry-cocoa as a prebuilt `Sentry.xcframework` by default. # diff --git a/packages/core/scripts/sentry_utils.rb b/packages/core/scripts/sentry_utils.rb index 43a778c019..adbf9d2b20 100644 --- a/packages/core/scripts/sentry_utils.rb +++ b/packages/core/scripts/sentry_utils.rb @@ -60,8 +60,8 @@ def is_new_hermes_runtime(rn_version) # `Sentry` module. `Sentry-Dynamic.xcframework` would ship the same # `Sentry.framework` inside but under a mismatched enclosing name, so # CocoaPods generates `-framework Sentry-Dynamic` and fails at link. - '9.19.1' => { - 'Sentry' => 'd6d545af17e49851cda2747b0f45cde78ce08ea37709dde5a956c6b4671224e8', + '9.22.0' => { + 'Sentry' => '5eeef9ad95be6b5965296e09ba41c5390382fe84988b15f1615cd0cc3fa7caca', }, }.freeze From 6c2c61d67621d904022ed290f62fd61f05d054cc Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 22 Jul 2026 13:17:04 +0200 Subject: [PATCH 2/2] ci(e2e): remove CocoaPods sample build job sentry-cocoa dropped CocoaPods (trunk) support after 9.19.1, so the source-build fallback (SENTRY_USE_XCFRAMEWORK=0) can no longer resolve newer versions. The dedicated CocoaPods regression job now fails on any Cocoa bump past 9.19.1, so remove it and the now single-valued sentry-consumption matrix dimension. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/sample-application.yml | 27 ++++++++---------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index 67fc1faba0..ffa621833d 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -43,7 +43,7 @@ jobs: caller_ref: ${{ github.ref }} build-ios: - name: Build ${{ matrix.rn-architecture }} ios ${{ matrix.build-type }} ${{ matrix.ios-use-frameworks }} ${{ matrix.sentry-consumption }} + name: Build ${{ matrix.rn-architecture }} ios ${{ matrix.build-type }} ${{ matrix.ios-use-frameworks }} runs-on: macos-26-xlarge needs: [diff_check, detect-changes] if: >- @@ -60,16 +60,11 @@ jobs: rn-architecture: ["new"] ios-use-frameworks: ["no-frameworks"] build-type: ["dev", "production"] - sentry-consumption: ["xcframework"] - # `xcframework` is the default: RNSentry vendors a prebuilt - # `Sentry-Dynamic.xcframework` downloaded from sentry-cocoa's release. - # Keep a single CocoaPods job to catch regressions in the source-build - # fallback (`SENTRY_USE_XCFRAMEWORK=0`). - include: - - rn-architecture: "new" - ios-use-frameworks: "no-frameworks" - build-type: "production" - sentry-consumption: "cocoapods" + # RNSentry vendors a prebuilt `Sentry.xcframework` downloaded from + # sentry-cocoa's release. sentry-cocoa dropped CocoaPods (trunk) + # support after 9.19.1, so the source-build fallback + # (`SENTRY_USE_XCFRAMEWORK=0`) can no longer resolve newer versions + # and is not exercised here. steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -105,7 +100,6 @@ jobs: [[ "${{ matrix.build-type }}" == "production" ]] && export ENABLE_PROD=1 || export ENABLE_PROD=0 [[ "${{ matrix.rn-architecture }}" == "new" ]] && export ENABLE_NEW_ARCH=1 || export ENABLE_NEW_ARCH=0 [[ "${{ matrix.ios-use-frameworks }}" == "dynamic-frameworks" ]] && export USE_FRAMEWORKS=dynamic - [[ "${{ matrix.sentry-consumption }}" == "cocoapods" ]] && export SENTRY_USE_XCFRAMEWORK=0 ./scripts/pod-install.sh @@ -123,10 +117,7 @@ jobs: ./scripts/build-ios.sh - name: Archive iOS App - # Only upload from the xcframework job (the default consumption path) - # to avoid duplicate artifact names when the CocoaPods regression job - # runs. - if: ${{ matrix.rn-architecture == 'new' && matrix.build-type == 'production' && matrix.ios-use-frameworks == 'no-frameworks' && matrix.sentry-consumption == 'xcframework' }} + if: ${{ matrix.rn-architecture == 'new' && matrix.build-type == 'production' && matrix.ios-use-frameworks == 'no-frameworks' }} working-directory: ${{ env.REACT_NATIVE_SAMPLE_PATH }} run: | zip -r \ @@ -134,7 +125,7 @@ jobs: sentryreactnativesample.app - name: Upload iOS APP - if: ${{ matrix.rn-architecture == 'new' && matrix.build-type == 'production' && matrix.ios-use-frameworks == 'no-frameworks' && matrix.sentry-consumption == 'xcframework' }} + if: ${{ matrix.rn-architecture == 'new' && matrix.build-type == 'production' && matrix.ios-use-frameworks == 'no-frameworks' }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: sample-rn-${{ matrix.rn-architecture }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks}}-ios @@ -145,7 +136,7 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: build-sample-${{ matrix.rn-architecture }}-ios-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks}}-${{ matrix.sentry-consumption }}-logs + name: build-sample-${{ matrix.rn-architecture }}-ios-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks}}-logs path: ${{ env.REACT_NATIVE_SAMPLE_PATH }}/ios/*.log build-android: