From 14eb86017e67c0e359e6a076f7de5c68cd875739 Mon Sep 17 00:00:00 2001 From: "Sven A. Schmidt" Date: Fri, 8 Dec 2023 14:13:43 +0100 Subject: [PATCH 1/3] Unpin swift-parsing --- Package.resolved | 21 +++++++++++++++------ Package.swift | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Package.resolved b/Package.resolved index 088f063..db9d5e7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "fc45e7b2cfece9dd80b5a45e6469ffe67fe67984", - "version" : "0.14.1" + "revision" : "a5521dde99570789d8cb7c43e51418d7cd1a87ca", + "version" : "1.1.2" } }, { @@ -14,8 +14,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-parsing", "state" : { - "branch" : "0.12.0", - "revision" : "c6e2241daa46e5c6e5027a93b161bca6ba692bcc" + "revision" : "a0e7d73f462c1c38c59dc40a3969ac40cea42950", + "version" : "0.13.0" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-syntax.git", + "state" : { + "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", + "version" : "509.0.2" } }, { @@ -23,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "50843cbb8551db836adec2290bb4bc6bac5c1865", - "version" : "0.9.0" + "revision" : "23cbf2294e350076ea4dbd7d5d047c1e76b03631", + "version" : "1.0.2" } } ], diff --git a/Package.swift b/Package.swift index 6e63828..c056136 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( targets: ["CanonicalPackageURLs"]), ], dependencies: [ - .package(url: "https://github.com/pointfreeco/swift-parsing", revision: "0.12.0") + .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0") ], targets: [ .target( From 4ef8901cdd49d3082cc28f2de6a1bb4801ca740f Mon Sep 17 00:00:00 2001 From: "Sven A. Schmidt" Date: Fri, 8 Dec 2023 15:17:01 +0100 Subject: [PATCH 2/3] Pin swift-case-paths instead of swift-parsing --- Package.resolved | 15 +++------------ Package.swift | 1 + 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Package.resolved b/Package.resolved index db9d5e7..4f14f50 100644 --- a/Package.resolved +++ b/Package.resolved @@ -3,10 +3,10 @@ { "identity" : "swift-case-paths", "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-case-paths", + "location" : "https://github.com/pointfreeco/swift-case-paths.git", "state" : { - "revision" : "a5521dde99570789d8cb7c43e51418d7cd1a87ca", - "version" : "1.1.2" + "branch" : "1.0.0", + "revision" : "5da6989aae464f324eef5c5b52bdb7974725ab81" } }, { @@ -18,15 +18,6 @@ "version" : "0.13.0" } }, - { - "identity" : "swift-syntax", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-syntax.git", - "state" : { - "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version" : "509.0.2" - } - }, { "identity" : "xctest-dynamic-overlay", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index c056136..e3ed54d 100644 --- a/Package.swift +++ b/Package.swift @@ -11,6 +11,7 @@ let package = Package( targets: ["CanonicalPackageURLs"]), ], dependencies: [ + .package(url: "https://github.com/pointfreeco/swift-case-paths.git", revision: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0") ], targets: [ From cdb7e60b997547aa7199c454754658f3784d6d8a Mon Sep 17 00:00:00 2001 From: "Sven A. Schmidt" Date: Fri, 8 Dec 2023 15:26:24 +0100 Subject: [PATCH 3/3] Add comment --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index e3ed54d..56c4b38 100644 --- a/Package.swift +++ b/Package.swift @@ -11,6 +11,7 @@ let package = Package( targets: ["CanonicalPackageURLs"]), ], dependencies: [ + // pin swift-case-paths to pre-macros, avoid pulling in swift-syntax, which causes link errors .package(url: "https://github.com/pointfreeco/swift-case-paths.git", revision: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0") ],