Merge branch 'main' into itay/cocoa-547-convert-sentryscreenframes-to-swift

Author: itaybre

.github/actions/prepare-package.swift/action.yml

@@ -12,11 +12,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Remove newer package files
-      # Remove newer package files when processing Package.swift to prevent interference
-      if: ${{ inputs.package-file == 'Package.swift' }}
-      shell: bash
-      run: rm -rf Package@swift*
     - name: Remove Sentry-Dynamic-WithARM64e target
       # We don't build it on PRs, so we need to remove it from the package.swift file.
       if: ${{ inputs.is-pr == 'true' }}
@@ -25,7 +20,8 @@ runs:
         PACKAGE_FILE: ${{ inputs.package-file }}
       run: |
         sed -i '' '/Sentry-Dynamic-WithARM64e/d' $PACKAGE_FILE
-        sed -i '' '/^[[:space:]]*\.binaryTarget($/{N;/\n[[:space:]]*),$/d;}' $PACKAGE_FILE
+        sed -i '' '/Sentry-WithoutUIKitOrAppKit-WithARM64e/d' $PACKAGE_FILE
+        sed -i '' '/^[[:space:]]*\.binaryTarget($/{N;/\n[[:space:]]*),\{0,1\}$/d;}' $PACKAGE_FILE
     - name: Change path of the framework
       shell: bash
       env:
@@ -35,3 +31,5 @@ runs:
         sed -i '' 's/checksum: ".*" \/\/Sentry-Static/path: "Sentry.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-Dynamic-WithARM64e/path: "Sentry-Dynamic-WithARM64e.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-Dynamic/path: "Sentry-Dynamic.xcframework.zip"/g' $PACKAGE_FILE
+        sed -i '' 's/checksum: ".*" \/\/Sentry-WithoutUIKitOrAppKit-WithARM64e/path: "Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip"/g' $PACKAGE_FILE
+        sed -i '' 's/checksum: ".*" \/\/Sentry-WithoutUIKitOrAppKit/path: "Sentry-WithoutUIKitOrAppKit.xcframework.zip"/g' $PACKAGE_FILE

.github/last-release-runid

@@ -1 +1 @@
-17674303183
+17733239540

.github/workflows/api-stability.yml

@@ -46,17 +46,16 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - run: ./scripts/ci-select-xcode.sh 16.4
 
       - name: Generate HEAD SDK
         run: |
           if [ "${{ matrix.version }}" = "v9" ]; then
             mv sdk_api_v9.json sdk_api_base.json
-            make generate-public-api CONFIG=V9
+            ./scripts/update-api.sh V9
             mv sdk_api_v9.json sdk_api.json
           else
             mv sdk_api.json sdk_api_base.json
-            make generate-public-api
+            ./scripts/update-api.sh
           fi
 
       - name: Diagnose breaking changes

.github/workflows/release.yml

@@ -300,7 +300,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/test.yml

@@ -134,11 +134,11 @@ jobs:
 
           # iOS 26 with Xcode 26
           - name: iOS 26 Sentry
-            runs-on: macos-15
+            runs-on: macos-26
             platform: "iOS"
             xcode: "26.0"
-            test-destination-os: "26.0"
-            device: "iPhone 16 Pro"
+            test-destination-os: "latest"
+            device: "iPhone 17 Pro"
             scheme: "Sentry"
 
           # We don't run the unit tests on macOS 13 cause we run them on all on GH actions available iOS versions.
@@ -161,6 +161,14 @@ jobs:
             test-destination-os: "latest"
             scheme: "Sentry"
 
+          # macOS 26
+          - name: macOS 26 Sentry
+            runs-on: macos-26
+            platform: "macOS"
+            xcode: "26.0"
+            test-destination-os: "latest"
+            scheme: "Sentry"
+
           # Catalyst. We test the latest version, as the risk something breaking on Catalyst and not
           # on an older iOS or macOS version is low.
           # In addition we are running tests on macOS 14, as there were OS-internal changes introduced in succeeding versions.
@@ -178,6 +186,8 @@ jobs:
             test-destination-os: "latest"
             scheme: "Sentry"
 
+          ## We don't run unit tests on macCatalyst 26 yet because of https://github.com/getsentry/sentry-cocoa/issues/6165.
+
           # We don't run the unit tests on tvOS 16 cause we run them on all on GH actions available iOS versions.
           # The chance of missing a bug solely on tvOS 16 that doesn't occur on iOS, tvOS 15 or tvOS 16 is minimal.
           # We are running tests on tvOS 17 and latest, as there were OS-internal changes introduced in succeeding versions.
@@ -207,6 +217,15 @@ jobs:
             test-destination-os: "18.4"
             scheme: "Sentry"
 
+          # tvOS 26
+          - name: tvOS 26 Sentry
+            runs-on: macos-26
+            platform: "tvOS"
+            xcode: "26.0"
+            test-destination-os: "latest"
+            device: "Apple TV"
+            scheme: "Sentry"
+
     steps:
       - uses: actions/checkout@v5
       - uses: actions/download-artifact@v5
@@ -217,13 +236,6 @@ jobs:
         run: ./scripts/start-test-server.sh
       - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}}
 
-      - name: Install required platforms for Xcode 26
-        if: matrix.xcode == '26.0' && matrix.platform != ''
-        run: ./scripts/ci-install-xOS-26-platforms.sh --platforms "${{matrix.platform}}"
-
-      - name: Create simulator device for Xcode 26
-        if: matrix.xcode == '26.0' && matrix.platform != ''
-        run: ./scripts/ci-create-simulator.sh --platform "${{matrix.platform}}" --os-version "${{matrix.test-destination-os}}" --device-name "${{matrix.device}}"
       - name: Install Slather
         run: gem install slather
 

.github/workflows/version-bump-util.yml

@@ -82,6 +82,8 @@ jobs:
           echo "<FAKE STATIC ZIP>" > Carthage/Sentry.xcframework.zip
           echo "<FAKE DYNAMIC ZIP>" > Carthage/Sentry-Dynamic.xcframework.zip
           echo "<FAKE DYNAMIC WITH ARM64E ZIP>" > Carthage/Sentry-Dynamic-WithARM64e.xcframework.zip
+          echo "<FAKE WITHOUT UIKIT OR APPKIT ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit.xcframework.zip
+          echo "<FAKE WITHOUT UIKIT OR APPKIT WITH ARM64E ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip
 
       - name: Bump version
         run: ./scripts/bump.sh ${{ steps.generate-version-number.outputs.OLD_VERSION }} ${{ steps.generate-version-number.outputs.NEW_VERSION }}
@@ -95,6 +97,8 @@ jobs:
             --static-checksum "7062a80f8a80f8b6d812698af87384751567a6aaa0df6f03b0596d728b22dcfd" \
             --dynamic-checksum "f6325cd8f05523d60222451fa61b3cd3d58148e5a21236f82abfd3f92750c87c" \
             --dynamic-with-arm64e-checksum "bbb84b054e5792aa705b95541aa4585f793e566a6b95638f8fef8e308d9782c3" \
+            --without-uikit-or-appkit-checksum "c647afe93889063325b5dfcabf43101749f6a8f37008cca858833ed280d2a84e" \
+            --without-uikit-or-appkit-with-arm64e-checksum "af5af7edc8e107fe04b905bd23524fdc93914fce8e1bd72ccf281408efff9a47" \
             --last-release-runid "${{ github.run_id }}"
 
   # This check validates that either version-bump-util passed or was skipped, which allows us

CHANGELOG-v9.md

@@ -16,6 +16,7 @@ Removes deprecated `setExtraValue` from SentrySpan (#5864)
 Removes `integrations` property from `SentryOptions` (#5749)
 Makes `SentryEventDecodable` internal (#5808)
 The `span` property on `SentryScope` is now readonly (#5866)
+Removes `enablePerformanceV2` option and makes this the default (#6008)
 
 ### Fixes
 

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Fix potential app launch hang caused by the SentrySDK (#6181) Fixed by removing the call to `_dyld_get_image_header` on the main thread.
+- Fix dyanmic selector crash in SentryReplayRecording (#6211)
+
+## 8.56.0
+
+### Features
+
+- Structured Logs: Flush logs on SDK flush/close (#5834)
+- Add masking options for screenshots (#5401)
+- Add significant time change breadcrumb (#6112)
+- Add support for iOS 26, macOS 26, visionOS 26, watchOS 26, and tvOS 26 in device tests (#6063)
+
+### Improvements
+
+- Lazily CharacterSet only once in SentryBaggageSerialization (#5871)
+- Structured Logging: Log `SentrySDK.logger` calls to `SentrySDKLog` (#5991)
+- The build type in the app context now differentiates between `enterprise` and `adhoc` (#6044)
+- visionOS no longer needs swift's interoperability mode (#6077)
+- Ensure IP address is only inferred by Relay if sendDefaultPii is true (#5877)
+- Sentry without UIKit / AppKit is available to install with SPM (#6160)
+
+### Fixes
+
+- Don't capture replays for events dropped in `beforeSend` (#5916)
+- Fix linking with SentrySwiftUI on Xcode 26 for visionOS (#5823)
+- Structured Logging: Logger called before `SentrySDK.start` becomes unusable (#5984)
+- Add masking for AVPlayerView (#5910)
+- Fix missing view hierachy when enabling `attachScreenshot` too (#5989)
+- Fix macOS's frameworks not following the versioned framework structure (#6049)
+- Add warning to addBreadcrumb when used before SDK init (#6083)
+- Add null-handling for parsed DSN in SentryHTTPTransport (#5800)
+- Fix crash in Session Replay when opening the camera UI on iOS 26+ by skipping redaction of internal views.
+  This may result in more of the camera screen being redacted. (#6045)
+- Fix crash in SentryDependencyContainer init when using the SDK as a static framework (#6125)
+- Fixes a React Native legacy build failure by adding the missing self references for explicit capture semantics (#6156)
+
 ## 8.56.0-alpha.3
 
 ### Fixes

Gemfile.lock

@@ -265,7 +265,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)

Package.swift

@@ -13,24 +13,36 @@ var products: [Product] = [
     .library(name: "Sentry", targets: ["Sentry", "SentryCppHelper"]),
     .library(name: "Sentry-Dynamic", targets: ["Sentry-Dynamic"]),
     .library(name: "Sentry-Dynamic-WithARM64e", targets: ["Sentry-Dynamic-WithARM64e"]),
+    .library(name: "Sentry-WithoutUIKitOrAppKit", targets: ["Sentry-WithoutUIKitOrAppKit", "SentryCppHelper"]),
+    .library(name: "Sentry-WithoutUIKitOrAppKit-WithARM64e", targets: ["Sentry-WithoutUIKitOrAppKit-WithARM64e", "SentryCppHelper"]),
     .library(name: "SentrySwiftUI", targets: ["Sentry", "SentrySwiftUI", "SentryCppHelper"])
 ]
 
 var targets: [Target] = [
     .binaryTarget(
         name: "Sentry",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0-alpha.3/Sentry.xcframework.zip",
-        checksum: "a78d6d16cbad0e21218c3816929d12391277e3db9bee862f986212e1cb0ef694" //Sentry-Static
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry.xcframework.zip",
+        checksum: "ecc100b59f2044800650f17786c33f071ea580cb318d82e8ce1d403b643555a4" //Sentry-Static
     ),
     .binaryTarget(
         name: "Sentry-Dynamic",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0-alpha.3/Sentry-Dynamic.xcframework.zip",
-        checksum: "d70a5deffe9db7fd755e001e96a080956022136496dbf83ce56eb5af8f550a1d" //Sentry-Dynamic
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic.xcframework.zip",
+        checksum: "509cdbc89e4409614f6d584464ef7e1d26c47ad8afe3abc2bd1e1d71c068be1e" //Sentry-Dynamic
     ),
     .binaryTarget(
         name: "Sentry-Dynamic-WithARM64e",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0-alpha.3/Sentry-Dynamic-WithARM64e.xcframework.zip",
-        checksum: "5a7eb7c6e6d49bb90e252d946f3e03477597d40604a860bbec74ee5aaf2d4272" //Sentry-Dynamic-WithARM64e
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
+        checksum: "d62a5ced65465c7c63962ed40d06a9aadd8675b8d0909089f89f65bf233e38c3" //Sentry-Dynamic-WithARM64e
+    ),
+    .binaryTarget(
+        name: "Sentry-WithoutUIKitOrAppKit",
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
+        checksum: "4abfe912bb543eedb7d7dd015df04c93c2b8e49437962046137653d4cf737d38" //Sentry-WithoutUIKitOrAppKit
+    ),
+    .binaryTarget(
+        name: "Sentry-WithoutUIKitOrAppKit-WithARM64e",
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
+        checksum: "0b6b454b48614f8cd2430cdc75e524ded46308309b95e73fdd9a90da81622e77" //Sentry-WithoutUIKitOrAppKit-WithARM64e
     ),
     .target (
         name: "SentrySwiftUI",