From be9d7a3a955d3e4893535f9fbe081b778cee7dfe Mon Sep 17 00:00:00 2001 From: Theo Spears Date: Sat, 25 Apr 2026 21:35:29 -0700 Subject: [PATCH 1/4] Revert "Bump github.com/swiftlang/swift-syntax from 603.0.0 to 603.0.1 (#768)" This reverts commit 48aa1b83aa2cbc0cc3ec3d4eee2cac86d4a49fb8. --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 79247871..02b946b6 100644 --- a/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081", - "version" : "603.0.1" + "revision" : "2b59c0c741e9184ab057fd22950b491076d42e91", + "version" : "603.0.0" } }, { From 020e872e5f7c0f4d7c26f426480c2f260edcd407 Mon Sep 17 00:00:00 2001 From: Theo Spears Date: Sat, 25 Apr 2026 21:35:29 -0700 Subject: [PATCH 2/4] Revert "Bump github.com/swiftlang/swift-syntax from 602.0.0 to 603.0.0 (#763)" This reverts commit eca8db1e423cf81055ad46ea7b1872cf52f965ac. --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 02b946b6..380226e2 100644 --- a/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "2b59c0c741e9184ab057fd22950b491076d42e91", - "version" : "603.0.0" + "revision" : "4799286537280063c85a32f09884cfbca301b1a1", + "version" : "602.0.0" } }, { From c15efbe9c8c93331a41f7dac1996e60b2abc495a Mon Sep 17 00:00:00 2001 From: Theo Spears Date: Sat, 25 Apr 2026 21:43:27 -0700 Subject: [PATCH 3/4] Add CI check for Package.resolved consistency Detects when checked-in Package.resolved contains versions that are incompatible with dependency constraints, which causes Xcode to silently re-resolve to different versions during build. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/fastlane-tests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/fastlane-tests.yml b/.github/workflows/fastlane-tests.yml index 85990821..f0cc542e 100644 --- a/.github/workflows/fastlane-tests.yml +++ b/.github/workflows/fastlane-tests.yml @@ -37,6 +37,13 @@ jobs: run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES - name: Run tests run: bundle exec fastlane ci + - name: Verify Package.resolved is consistent + run: | + if ! git diff --quiet BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; then + echo "::error::Package.resolved was modified during build. This means the checked-in versions are incompatible with the project's dependency constraints. Diff:" + git diff BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved + exit 1 + fi - name: Upload report uses: actions/upload-artifact@v7 if: always() # always run even if the previous step fails From cfdd894f69861c247dedea27960b55019754884e Mon Sep 17 00:00:00 2001 From: Theo Spears Date: Sat, 25 Apr 2026 21:45:22 -0700 Subject: [PATCH 4/4] Bump keychain-swift minimum version to 24.0.0 The Dependabot PR #754 bumped the pin in Package.resolved to 24.0.0 but the project constraint was still upToNextMajorVersion: 20.0.0 (which only allows 20.0.0..<21.0.0), causing Xcode to re-resolve back to 20.0.0. Co-Authored-By: Claude Opus 4.6 (1M context) --- BeeSwift.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeeSwift.xcodeproj/project.pbxproj b/BeeSwift.xcodeproj/project.pbxproj index 0efa6607..6078e1ad 100644 --- a/BeeSwift.xcodeproj/project.pbxproj +++ b/BeeSwift.xcodeproj/project.pbxproj @@ -1077,7 +1077,7 @@ repositoryURL = "https://github.com/evgenyneu/keychain-swift"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 20.0.0; + minimumVersion = 24.0.0; }; }; E462BA3429AC44EA00E80EF0 /* XCRemoteSwiftPackageReference "Alamofire" */ = {