fix: Add Package@swift-6.1.swift for Xcode 26 SPM compatibility#7784
Merged
fix: Add Package@swift-6.1.swift for Xcode 26 SPM compatibility#7784
Package@swift-6.1.swift for Xcode 26 SPM compatibility#7784Conversation
Xcode 26 uses Swift 6.1 which enforces SE-0450 Package Traits. SPM selects version-specific manifests by swift-tools-version, so Package@swift-6.1.swift is used when the Swift 6.1 compiler is active. Changes: - Add Package@swift-6.1.swift with swift-tools-version:6.1 and traits declaration (required by SE-0450) - Keep original Package.swift (5.3) untouched for older toolchains - Binary xcframework URLs remain at 8.58.0 (no SDK change) Fixes: getsentry/sentry-kotlin-multiplatform#535
- Add checksum marker comments to Package@swift-6.1.swift so that update-package-sha.sh and verify-package-sha.sh can find and update the checksums (they already glob Package@swift-*.swift files but rely on the inline //Sentry-* comments for sed/grep patterns) - Add ./Package@swift-6.1.swift to the VersionBump files list so the version URL is bumped during releases - Update prepare-package.swift action to loop over all Package*.swift files (removing unused package-file input), consistent with the other release scripts - Update clang-format (22.1.3) and swiftlint (0.63.2) version files and apply reformatting Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
itaybre
requested review from
noahsmartin,
philipphofmann and
philprime
as code owners
Contributor
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. Bug Fixes 🐛
🤖 This preview updates automatically when you update the PR. |
❌ 1 Tests Failed:
View the top 1 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
- Updated build and test scripts to use iOS simulator version 18.5 instead of 18.4. - Adjusted references in build.yml, release.yml, test-cross-platform.yml, test.yml, and ui-tests-critical.yml. - Modified Fastfile in the iOS-Cocoapods-Swift6 sample to reflect the new simulator version.
Swift 6.1's stricter SPM validation requires publicHeadersPath to be explicitly set when the default 'include' directory doesn't exist at the target root. SentryObjc uses path: "Sources" but headers live at Sources/Sentry/include, so we explicitly set publicHeadersPath to "Sentry/include". Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| e537c90 | 1226.22 ms | 1256.64 ms | 30.41 ms |
| b66be9b | 1218.22 ms | 1244.19 ms | 25.96 ms |
| 5e3fb04 | 1239.84 ms | 1267.39 ms | 27.55 ms |
| b79b552 | 1216.04 ms | 1241.27 ms | 25.22 ms |
| 33c9619 | 1233.02 ms | 1252.60 ms | 19.58 ms |
| 48dc176 | 1204.96 ms | 1237.73 ms | 32.77 ms |
| b79b552 | 1210.26 ms | 1232.54 ms | 22.28 ms |
| f73c5c8 | 1211.10 ms | 1234.62 ms | 23.51 ms |
| 3af1ae9 | 1225.60 ms | 1252.65 ms | 27.05 ms |
| 237dfb1 | 1214.90 ms | 1258.63 ms | 43.73 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| e537c90 | 23.75 KiB | 992.03 KiB | 968.28 KiB |
| b66be9b | 23.75 KiB | 996.03 KiB | 972.28 KiB |
| 5e3fb04 | 23.74 KiB | 981.30 KiB | 957.56 KiB |
| b79b552 | 23.75 KiB | 992.16 KiB | 968.41 KiB |
| 33c9619 | 24.14 KiB | 1001.34 KiB | 977.19 KiB |
| 48dc176 | 24.14 KiB | 1001.34 KiB | 977.20 KiB |
| b79b552 | 23.75 KiB | 992.25 KiB | 968.50 KiB |
| f73c5c8 | 24.14 KiB | 1001.32 KiB | 977.18 KiB |
| 3af1ae9 | 23.74 KiB | 981.29 KiB | 957.55 KiB |
| 237dfb1 | 23.75 KiB | 1000.79 KiB | 977.04 KiB |
Removed deprecated comments and updated iOS simulator version.
Consolidate changelog entries for Xcode 26 SPM compatibility.
itaybre
changed the title
Package@swift-6.1.swift for Xcode 26 SPM compatibility
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR extends the release tooling introduced in #7768 to fully support
Package@swift-6.1.swiftalongsidePackage.swift.Package@swift-6.1.swift: Added inline marker comments (//Sentry-Static,//Sentry-Dynamic, etc.) to each binary target checksum line.update-package-sha.shandverify-package-sha.shalready globPackage@swift-*.swiftfiles, but rely on these comments for theirsed/greppatterns.Utils/VersionBump/main.swift: Added./Package@swift-6.1.swiftto thefilesarray so version bump updates the download URLs in it during releases..github/actions/prepare-package.swift/action.yml: Updated the action to loop over allPackage*.swiftfiles automatically (removed the now-unnecessarypackage-fileinput), consistent withupdate-package-sha.shandverify-package-sha.sh.Fixes: getsentry/sentry-kotlin-multiplatform#535
Test plan
version-bump-utilCI job coversPackage@swift-6.1.swiftvia therun_version_bump_util_for_prsfilter (Package*.swiftglob)releaseCI job'sprepare-package.swiftaction now processes both package files