Merge remote-tracking branch 'origin/main' into philprime/test-samples-ios-swift

Author: philprime

.cursor/mcp.json

@@ -9,7 +9,6 @@
       ]
     },
     "sentry": {
-      "type": "http",
       "url": "https://mcp.sentry.dev/mcp/sentry-sdks/sentry-cocoa"
     }
   }

.github/ISSUE_TEMPLATE/bug.yml

@@ -44,6 +44,25 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: other_error_monitoring
+    attributes:
+      description: Are you using any other error monitoring solution alongside Sentry?
+      label: Other Error Monitoring Solution
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: input
+    id: other_error_monitoring_name
+    attributes:
+      label: Other Error Monitoring Solution Name
+      description: If you're using another error monitoring solution side-by-side, please enter the name of the other solution.
+    validations:
+      required: false
+
   - type: input
     id: version
     attributes:

.github/file-filters.yml

@@ -40,6 +40,7 @@ run_unit_tests_for_prs: &run_unit_tests_for_prs
   - "scripts/tests-with-thread-sanitizer.sh"
   - "scripts/ci-boot-simulator.sh"
   - "scripts/ci-ensure-runtime-loaded.sh"
+  - "scripts/prepare-package.sh"
 
   # Test infrastructure
   - "test-server/**"
@@ -249,6 +250,7 @@ run_release_for_prs: &run_release_for_prs
   - "scripts/assemble-xcframework.sh"
   - "scripts/generate_release_matrix.sh"
   - "scripts/xcframework-generated-run.sh"
+  - "scripts/prepare-package.sh"
 
   # Project files
   - "Sentry.xcworkspace/**"
@@ -346,6 +348,7 @@ run_build_for_prs: &run_build_for_prs
   - "scripts/sentry-xcodebuild.sh"
   - "scripts/check-ui-framework-linkage.sh"
   - "scripts/ci-utils.sh"
+  - "scripts/prepare-package.sh"
 
   # Build configuration
   - "fastlane/**"

.github/last-release-runid

@@ -1 +1 @@
-22671956251
+22957182287

.github/workflows/auto-update-tools.yml

@@ -61,8 +61,17 @@ jobs:
     needs: files-changed
     runs-on: macos-15
     steps:
+      - name: Generate GitHub App Token
+        id: app_token
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        with:
+          app-id: ${{ vars.SENTRY_DEPENDENCY_UPDATER_GITHUB_APP_ID }}
+          private-key: ${{ secrets.SENTRY_DEPENDENCY_UPDATER_GITHUB_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
       - name: Checkout Repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          token: ${{ steps.app_token.outputs.token }}
       - name: Update Homebrew
         run: brew update
 
@@ -84,6 +93,7 @@ jobs:
         uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
         with:
+          token: ${{ steps.app_token.outputs.token }}
           add-paths: scripts/.clang-format-version
           branch: github-actions/auto-update-tools-clang-format
           commit-message: "chore(deps): Update clang-format version"
@@ -96,6 +106,7 @@ jobs:
         uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
         with:
+          token: ${{ steps.app_token.outputs.token }}
           add-paths: scripts/.swiftlint-version
           branch: github-actions/auto-update-tools-swiftlint
           commit-message: "chore(deps): Update swiftlint version"

.github/workflows/build.yml

@@ -189,7 +189,8 @@ jobs:
 
   check-macOS-CLI-Xcode-no-UI-framework:
     name: macOS CLI (NoUIFramework) builds and has no AppKit/UIKit
-    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_build_for_prs == 'true'
+    # Don't run this on release branches, cause the SPM Package.swift points to the unreleased versions.
+    if: startsWith(github.ref, 'refs/heads/release/') == false && (github.event_name != 'pull_request' || needs.files-changed.outputs.run_build_for_prs == 'true')
     needs: files-changed
     runs-on: macos-26
     steps:

.github/workflows/nightly-test.yml

@@ -45,6 +45,14 @@ jobs:
             platform: "iOS"
             device: "iPad Pro 13-inch (M5)"
 
+          - name: watchOS 26 Sentry
+            runs-on: tahoe
+            xcode: "26.2"
+            test-destination-os: "26.4"
+            platform: "watchOS"
+            device: "Apple Watch Ultra 3 (49mm)"
+            timeout: 30
+
           - name: visionOS 2.5 Sentry
             runs-on: sequoia
             xcode: "26.0.1"

.gitignore

@@ -137,3 +137,5 @@ XCFrameworkBuildPath/
 language-trends.html
 # .agents/.gitignore is generated by dotagents — don't commit it.
 .agents/.gitignore
+# Auto-generated by dotagents — do not commit these files.
+agents.lock

3rd-party-integrations/SentryCocoaLumberjack/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack", from: "3.8.0"),
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.6.0")
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.7.0")
     ],
     targets: [
         .target(

3rd-party-integrations/SentryPulse/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/kean/Pulse", from: "5.0.0"),
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.6.0")
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.7.0")
     ],
     targets: [
         .target(