From 6cab7abaff3f64a3983690a9f2af945dca4631ef Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Mon, 24 Apr 2023 09:31:53 +0100 Subject: [PATCH 1/2] TSCBasic: fix compatibility with Swift 5.5 --- Sources/TSCBasic/FileSystem.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift index 77b66baf..b53079e4 100644 --- a/Sources/TSCBasic/FileSystem.swift +++ b/Sources/TSCBasic/FileSystem.swift @@ -1021,7 +1021,11 @@ public final class InMemoryFileSystem: FileSystem { } // Internal state of `InMemoryFileSystem` is protected with a lock in all of its `public` methods. +#if compiler(>=5.7) extension InMemoryFileSystem: @unchecked Sendable {} +#else +extension InMemoryFileSystem: UnsafeSendable {} +#endif /// A rerooted view on an existing FileSystem. /// @@ -1176,7 +1180,11 @@ public final class RerootedFileSystemView: FileSystem { // `RerootedFileSystemView` doesn't hold any internal state and can be considered `Sendable` since // `underlyingFileSystem` is required to be `Sendable`. +#if compiler(>=5.7) extension RerootedFileSystemView: @unchecked Sendable {} +#else +extension RerootedFileSystemView: UnsafeSendable {} +#endif private var _localFileSystem: FileSystem = LocalFileSystem() From 0fed0a2fc0a229d47ca3d0d357ec2b58c0e3631b Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Tue, 25 Apr 2023 10:29:39 +0100 Subject: [PATCH 2/2] Update Package.resolved --- Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved index f7e90ace..9c8ba7f9 100644 --- a/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -60,7 +60,7 @@ "repositoryURL": "https://github.com/apple/swift-syntax.git", "state": { "branch": "main", - "revision": "2d5575b8771c5ccd5673428d959085ddb74dbbf7", + "revision": "a6486790b46a4469bfb2b09d7ff6463aaecc40e5", "version": null } },