Merge branch 'main' of github.com:getsentry/sentry-cocoa into itay/cocoa-533-convert-sentryreachability-to-swift

Author: itaybre

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

@@ -5,18 +5,19 @@ inputs:
     description: "Whether the build is a PR"
     required: true
     default: "false"
+  remove-duplicate:
+    description: "Whether to remove targets that produce duplicate files. These targets cause SPM validation errors."
+    default: "false"
+  change-path:
+    description: "Whether to change the path of the framework"
+    default: "true"
   package-file:
     description: "The package file to prepare"
     required: true
     default: "Package.swift"
 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,8 +26,19 @@ 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: Remove duplicate target
+      if: ${{ inputs.remove-duplicate == 'true' }}
+      shell: bash
+      env:
+        PACKAGE_FILE: ${{ inputs.package-file }}
+      run: |
+        sed -i '' '/Sentry-Dynamic/d' $PACKAGE_FILE
+        sed -i '' '/Sentry-WithoutUIKitOrAppKit/d' $PACKAGE_FILE
+        sed -i '' '/^[[:space:]]*\.binaryTarget($/{N;/\n[[:space:]]*),\{0,1\}$/d;}' $PACKAGE_FILE
     - name: Change path of the framework
+      if: ${{ inputs.change-path == 'true' }}
       shell: bash
       env:
         PACKAGE_FILE: ${{ inputs.package-file }}
@@ -35,3 +47,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 @@
-17594240990
+18033198122

.github/workflows/api-stability.yml

@@ -38,33 +38,24 @@ jobs:
     if: needs.files-changed.outputs.run_api_stability_for_prs == 'true'
     needs: files-changed
     runs-on: macos-15
-    strategy:
-      matrix:
-        version: [default, v9]
     steps:
       - name: Checkout code
         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
-            mv sdk_api_v9.json sdk_api.json
-          else
-            mv sdk_api.json sdk_api_base.json
-            make generate-public-api
-          fi
+          mv sdk_api_V9.json sdk_api_base.json
+          ./scripts/update-api.sh V9
+          mv sdk_api_V9.json sdk_api.json
 
       - name: Diagnose breaking changes
         run: |
           if diff -q "sdk_api_base.json" "sdk_api.json" > /dev/null; then
-            echo "No API changes detected for ${{ matrix.version }} version."
+            echo "No API changes detected."
           else
-            echo "❌ Public API changes are detected for ${{ matrix.version }} version. If they're intended run "make generate-public-api" and commit the changes."
+            echo "❌ Public API changes are detected. If they're intended run "make generate-public-api" and commit the changes."
             diff "sdk_api_base.json" "sdk_api.json" || true
             xcrun --sdk iphoneos swift-api-digester \
               -diagnose-sdk \

.github/workflows/build.yml

@@ -98,6 +98,8 @@ jobs:
             config: DebugV9
           - scheme: iOS-ObjectiveC
             config: DebugV9
+          - scheme: DistributionSample
+            config: Debug
 
     steps:
       - uses: actions/checkout@v5
@@ -108,13 +110,14 @@ jobs:
       # Note: Due to complexity in implementing the CODE_SIGNING_ALLOWED flag in the sentry-xcodebuild.sh script,
       #       we did not yet migrate this step to use the script yet.
       - run: >-
-          env NSUnbufferedIO=YES
-          xcodebuild
+          set -o pipefail && NSUnbufferedIO=YES xcodebuild
           -workspace Sentry.xcworkspace
           -scheme '${{matrix.scheme}}'
-          -configuration ${{matrix.config}}
+          -configuration '${{matrix.config}}'
           CODE_SIGNING_ALLOWED="NO"
-          build
+          build 2>&1
+          | tee raw-build-output.log
+          | xcbeautify --preserve-unbeautified
 
       - name: Archiving Raw Build Logs
         uses: actions/upload-artifact@v4
@@ -128,6 +131,26 @@ jobs:
         if: ${{ failure() || cancelled() }}
         run: ./scripts/ci-diagnostics.sh
 
+  build-distribution:
+    name: Build the distribution framework
+    runs-on: macos-15
+    needs: files-changed
+    steps:
+      - uses: actions/checkout@v5
+
+      - run: ./scripts/ci-select-xcode.sh 16.4
+        shell: sh
+      - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
+      - run: set -o pipefail && NSUnbufferedIO=YES xcodebuild build -scheme SentryDistribution -sdk iphoneos -destination 'generic/platform=iphoneos' | tee raw-build-output-spm.log | xcbeautify
+        shell: sh
+      - name: Upload SPM Build Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: raw-build-output-spm
+          path: |
+            raw-build-output-spm.log
+
   build-spm:
     name: Build with SPM
     runs-on: macos-15
@@ -339,6 +362,7 @@ jobs:
         files-changed,
         ios-swift-release,
         build-sample,
+        build-distribution,
         build-spm,
         build-v9,
         check-debug-without-UIKit,

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
     if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     needs: files-changed
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup matrix combinations
         id: setup-matrix-combinations
         run: |
@@ -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

@@ -92,11 +92,140 @@ jobs:
         if: failure()
         run: ./scripts/ci-diagnostics.sh
 
+  distribution-tests:
+    name: Distribution Tests
+    runs-on: macos-15
+    needs: files-changed
+    steps:
+      - uses: actions/checkout@v5
+      - name: Prepare Package.swift
+        uses: ./.github/actions/prepare-package.swift
+        with:
+          is-pr: ${{ github.event_name == 'pull_request' }}
+          change-path: false
+          remove-duplicate: true
+      - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
+      - run: set -o pipefail && NSUnbufferedIO=YES SKIP_BINARIES=1 xcodebuild test -scheme Sentry-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16 Pro' | tee raw-test-output-distribution.log | xcbeautify --preserve-unbeautified
+        shell: sh
+      - name: Upload Distribution Test Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: raw-test-output-distribution
+          path: |
+            raw-test-output-distribution.log
+
+  # This matrix runs only the unit tests requiring the test server.
+  # We do this to speed up the other unit test jobs and to avoid running the
+  # test server with potential side effects in GH actions for all unit tests.
+  # We don't run this matrix for all different OS versions, because the chances
+  # of a bug solely on a specific OS version is minimal.
+  unit-tests-with-test-server:
+    name: Unit with Test Server ${{matrix.name}}
+    runs-on: ${{matrix.runs-on}}
+    timeout-minutes: 20
+    needs: build-test-server
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: iOS 18
+            runs-on: macos-15
+            platform: "iOS"
+            xcode: "16.4"
+            device: "iPhone 16 Pro"
+            test-destination-os: "18.5"
+
+          - name: macOS 15
+            runs-on: macos-15
+            platform: "macOS"
+            xcode: "16.4"
+            test-destination-os: "15.0"
+
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/download-artifact@v5
+        with:
+          name: test-server
+
+      - name: Start Test Server
+        run: ./scripts/start-test-server.sh
+      - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}}
+
+      # Note: We don't install Slather or gather code coverage for this job because it only runs
+      # the SentryTestServerTests target, which contains minimal tests that don't significantly
+      # contribute to overall code coverage metrics. The main unit-tests job handles comprehensive
+      # code coverage reporting.
+
+      # We split building and running tests in two steps so we know how long running the tests takes.
+      - name: Build tests
+        id: build_tests
+        run: |
+          ./scripts/sentry-xcodebuild.sh \
+            --platform ${{matrix.platform}} \
+            --os ${{matrix.test-destination-os}} \
+            --ref ${{ github.ref_name }} \
+            --command build-for-testing \
+            --device "${{matrix.device}}" \
+            --configuration TestCI \
+            --scheme Sentry \
+            --test-plan Sentry_TestServer
+
+      - name: Run tests
+        run: |
+          ./scripts/sentry-xcodebuild.sh \
+            --platform ${{matrix.platform}} \
+            --os ${{matrix.test-destination-os}} \
+            --ref ${{ github.ref_name }} \
+            --command test-without-building \
+            --device "${{matrix.device}}" \
+            --configuration TestCI \
+            --scheme Sentry \
+            --test-plan Sentry_TestServer
+
+      - name: Archiving DerivedData Logs
+        uses: actions/upload-artifact@v4
+        if: steps.build_tests.outcome == 'failure'
+        with:
+          name: derived-data-test-server-${{matrix.platform}}-xcode-${{matrix.xcode}}
+          path: |
+            /Users/runner/Library/Developer/Xcode/DerivedData/**/Logs/**
+
+      - name: Archiving Raw Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: raw-output-test-server-${{matrix.platform}}-xcode-${{matrix.xcode}}
+          path: |
+            raw-build-output.log
+            raw-build-for-testing-output.log
+            raw-test-output.log
+
+      - name: Archiving Crash Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: crash-logs-test-server-${{matrix.platform}}-xcode-${{matrix.xcode}}
+          path: |
+            ~/Library/Logs/DiagnosticReports/**
+
+      - name: Run CI Diagnostics
+        if: ${{ failure() || cancelled() }}
+        run: ./scripts/ci-diagnostics.sh
+
+      - name: Store screenshot
+        uses: ./.github/actions/capture-screenshot
+        if: ${{ failure() || cancelled() }}
+        with:
+          suffix: ${{ matrix.platform }}-xcode-${{ matrix.xcode }}
+
   unit-tests:
     name: Unit ${{matrix.name}}
     runs-on: ${{matrix.runs-on}}
     timeout-minutes: 20
-    needs: build-test-server
+    needs: files-changed
+    if: needs.files-changed.outputs.run_unit_tests_for_prs == 'true'
 
     strategy:
       fail-fast: false
@@ -132,6 +261,15 @@ jobs:
             device: "iPhone 16 Pro"
             scheme: "Sentry"
 
+          # iOS 26 with Xcode 26
+          - name: iOS 26 Sentry
+            runs-on: macos-26
+            platform: "iOS"
+            xcode: "26.0"
+            test-destination-os: "26.0"
+            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.
           # The chance of missing a bug solely on tvOS 16 that doesn't occur on iOS, macOS 12 or macOS 14 is minimal.
           # We are running tests on macOS 14 and later, as there were OS-internal changes introduced in succeeding versions.
@@ -152,6 +290,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: "26.0"
+            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.
@@ -169,6 +315,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.
@@ -198,15 +346,17 @@ 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: "26.0"
+            device: "Apple TV"
+            scheme: "Sentry"
+
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/download-artifact@v5
-        with:
-          name: test-server
-
-      - name: Start Test Server
-        run: ./scripts/start-test-server.sh
-
       - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}}
 
       - name: Install Slather
@@ -326,7 +476,9 @@ jobs:
       [
         files-changed,
         build-test-server,
+        distribution-tests,
         unit-tests,
+        unit-tests-with-test-server,
       ]
     name: Unit Tests
     # This is necessary since a failed/skipped dependent job would cause this job to be skipped