From 39f7ced5f2f869da2647e3cb2630def2311086fa Mon Sep 17 00:00:00 2001 From: Lakr Date: Thu, 1 Oct 2026 22:55:29 +0900 Subject: [PATCH] swift-collections 1.7.1, no longer pinned at 1.6.0 1.7.1 works around the Swift 6.4 defect that linked _swift_initBorrow strongly (apple/swift-collections#739). A Release vphoned built with it imports no _swift_initBorrow; StageBundle.sh keeps refusing one that does. Co-Authored-By: Claude Opus 5.5 --- VPhone.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- VPhoneDaemon/VPhoneDaemon.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VPhone.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VPhone.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5700833..8950263 100644 --- a/VPhone.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/VPhone.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -141,8 +141,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a", - "version" : "1.6.0" + "revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6", + "version" : "1.7.1" } }, { diff --git a/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.pbxproj b/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.pbxproj index ce03115..ce12bed 100644 --- a/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.pbxproj +++ b/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.pbxproj @@ -360,8 +360,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-collections.git"; requirement = { - kind = exactVersion; - version = 1.6.0; + kind = upToNextMajorVersion; + minimumVersion = 1.7.1; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e593cfe..c3144b7 100644 --- a/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/VPhoneDaemon/VPhoneDaemon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -42,8 +42,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a", - "version" : "1.6.0" + "revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6", + "version" : "1.7.1" } }, { diff --git a/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh b/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh index dca2fce..1d8ec76 100755 --- a/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh +++ b/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh @@ -49,8 +49,8 @@ daemon_products="$root/.build/XcodeDaemon/Build/Products/$configuration-iphoneos amfi_products="$root/.build/XcodeAMFIAllow/Build/Products/$configuration" guest_products="$root/.build/guest-components/stage" -# The iOS 26 Swift runtime lacks this symbol. Swift Collections 1.7.0 emits -# it with Xcode 27 even when vphoned targets iOS 15, causing a dyld crash loop. +# The iOS 26 Swift runtime lacks this symbol, and Swift 6.4 can import it +# strongly even when vphoned targets iOS 15, causing a dyld crash loop. if /usr/bin/nm -u "$daemon_products/vphoned" | /usr/bin/grep -q '_swift_initBorrow'; then print -u2 -- "vphoned requires _swift_initBorrow, which is unavailable on iOS 26" exit 1 diff --git a/VPhoneExecutable/VPhoneVirtualization/VPhoneVirtualization.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VPhoneExecutable/VPhoneVirtualization/VPhoneVirtualization.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7285d32..99c087c 100644 --- a/VPhoneExecutable/VPhoneVirtualization/VPhoneVirtualization.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/VPhoneExecutable/VPhoneVirtualization/VPhoneVirtualization.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "a66de878e87ef5a3d5d390e0f6d9002aa5541a43", - "version" : "1.7.0" + "revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6", + "version" : "1.7.1" } }, {