chore: Merge origin/main into philprime/sync-folders-2-restructure

Resolved conflicts in:
- Sample app yml files (added buildPhase: none for configuration files)
- schema/xcodegen.schema.json (correct description for tabWidth)
- File renames (kept both LoremIpsumView.swift for different projects, kept Info.plist in Configurations)

Added swiftlint:disable for test file with long functions.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: philprime

.github/workflows/analyze-language-trends.yml

@@ -37,7 +37,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y cmake pkg-config libicu-dev
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
 

.github/workflows/assemble-xcframework-variant.yml

@@ -71,7 +71,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         if: ${{ inputs.signed }}
         with:
           bundler-cache: true

.github/workflows/benchmarking.yml

@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - run: ./scripts/ci-select-xcode.sh 26.1.1
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
       - run: make init-ci-build

.github/workflows/build.yml

@@ -63,7 +63,7 @@ jobs:
 
       - run: ./scripts/ci-select-xcode.sh 26.2
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
       - run: make init-ci-build
@@ -187,6 +187,37 @@ jobs:
         if: ${{ failure() || cancelled() }}
         run: ./scripts/ci-diagnostics.sh
 
+  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'
+    needs: files-changed
+    runs-on: macos-26
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Select Xcode
+        run: ./scripts/ci-select-xcode.sh 26.4
+
+      - name: Build macOS-CLI-Xcode sample
+        run: |
+          set -o pipefail && xcodebuild \
+            -project "Samples/macOS-CLI-Xcode/macOS-CLI-Xcode.xcodeproj" \
+            -scheme macOS-CLI-Xcode \
+            -configuration Debug \
+            -destination 'platform=macOS' \
+            -derivedDataPath "$GITHUB_WORKSPACE/cli-xcode-build" \
+            CODE_SIGNING_ALLOWED="NO" build | xcbeautify --preserve-unbeautified
+
+      - name: Ensure CLI binary does not link AppKit
+        run: ./scripts/check-ui-framework-linkage.sh --configuration Debug --derived-data "$GITHUB_WORKSPACE/cli-xcode-build" --linkage unlinked --module macOS-CLI-Xcode --framework AppKit
+
+      - name: Ensure CLI binary does not link UIKit
+        run: ./scripts/check-ui-framework-linkage.sh --configuration Debug --derived-data "$GITHUB_WORKSPACE/cli-xcode-build" --linkage unlinked --module macOS-CLI-Xcode --framework UIKit
+
+      - name: Debug Xcode environment
+        if: ${{ failure() || cancelled() }}
+        run: ./scripts/ci-diagnostics.sh
+
   build-distribution:
     name: Build the distribution framework
     runs-on: macos-15
@@ -456,6 +487,7 @@ jobs:
         ios-swift-release,
         build-sample,
         build-sample-spm,
+        check-macOS-CLI-Xcode-no-UI-framework,
         build-distribution,
         build-spm,
         check-debug-without-UIKit,

.github/workflows/changelog-preview.yml

@@ -10,5 +10,5 @@ permissions:
 
 jobs:
   changelog-preview:
-    uses: getsentry/craft/.github/workflows/changelog-preview.yml@ce288193e2ac7976b0ffd1d5733527605e6fd63b # v2
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@d630201930c7fe5aee6366ebee19ebb681128512 # v2
     secrets: inherit

.github/workflows/integration-test.yml

@@ -45,7 +45,7 @@ jobs:
         run: ./scripts/ci-select-xcode.sh 16.4
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
 

.github/workflows/lint-cocoapods-specs.yml

@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - run: ./scripts/ci-select-xcode.sh 16.4
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
       # We need to update the spec-repo, because it can happen that it is not up to date and then the lint fails.

.github/workflows/objc-conversion-analysis.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
 

.github/workflows/release.yml

@@ -164,6 +164,10 @@ jobs:
             --package-file Package.swift \
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --change-path true
+          ./scripts/prepare-package.sh \
+            --package-file Package@swift-6.1.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build
         working-directory: Samples/macOS-SPM-CommandLine
@@ -190,6 +194,10 @@ jobs:
             --package-file Package.swift \
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --change-path true
+          ./scripts/prepare-package.sh \
+            --package-file Package@swift-6.1.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build
         working-directory: Samples/SPM-Dynamic
@@ -216,6 +224,10 @@ jobs:
             --package-file Package.swift \
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --change-path true
+          ./scripts/prepare-package.sh \
+            --package-file Package@swift-6.1.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build --target SentrySwiftUI
       - name: Run CI Diagnostics
@@ -241,6 +253,10 @@ jobs:
             --package-file Package.swift \
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --change-path true
+          ./scripts/prepare-package.sh \
+            --package-file Package@swift-6.1.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: set -o pipefail &&xcodebuild build -scheme visionOS-SPM -sdk xros -destination 'generic/platform=xros' | tee raw-build-output-spm-visionOS.log | xcbeautify
         working-directory: Samples/visionOS-SPM
@@ -282,7 +298,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - run: ./scripts/ci-select-xcode.sh 16.4
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true
       - uses: actions/cache@v5
@@ -380,7 +396,7 @@ jobs:
           GITHUB_RUN_ID: ${{ github.run_id }}
 
       - name: Prepare release
-        uses: getsentry/craft@ce288193e2ac7976b0ffd1d5733527605e6fd63b # v2
+        uses: getsentry/craft@d630201930c7fe5aee6366ebee19ebb681128512 # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:

.github/workflows/size-analysis.yml

@@ -66,7 +66,7 @@ jobs:
         run: ./scripts/ci-select-xcode.sh 26.1.1
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           bundler-cache: true