From 476a7c04fa545ca57e7d17321120a693d0e5e468 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 21 Oct 2023 09:58:38 -0700 Subject: [PATCH 1/3] manifest: use a stable release for swift-log There is the 1.4.3 release of swift-log that contains the required changes. Update the manifest to try to use a stable release instead of main. --- Package.swift | 5 ++--- Package@swift-5.4.swift | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index ebf48379..c0091392 100644 --- a/Package.swift +++ b/Package.swift @@ -11,9 +11,8 @@ let SwiftWin32 = Package( .executable(name: "Calculator", targets: ["Calculator"]), ], dependencies: [ - // NOTE(compnerd) require main as no current release has support for the - // new CRT module. - .package(url: "https://github.com/apple/swift-log.git", branch: "main"), + .package(url: "https://github.com/apple/swift-log.git", + .uptoNextMajor(from: "1.4.3")), .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.0")), .package(url: "https://github.com/compnerd/cassowary.git", branch: "main"), diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift index 0881b615..d01b28dc 100644 --- a/Package@swift-5.4.swift +++ b/Package@swift-5.4.swift @@ -11,9 +11,8 @@ let SwiftWin32 = Package( .executable(name: "Calculator", targets: ["Calculator"]), ], dependencies: [ - // NOTE(compnerd) require main as no current release has support for the - // new CRT module. - .package(url: "https://github.com/apple/swift-log.git", .branch("main")), + .package(url: "https://github.com/apple/swift-log.git", + .uptoNextMajor(from: "1.4.3")), .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.0")), .package(url: "https://github.com/compnerd/cassowary.git", .branch("main")), From aa49a99a757e0855c4acb064bd3e4cfd16cf4a3e Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 21 Oct 2023 11:51:17 -0700 Subject: [PATCH 2/3] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c0091392..89421b0d 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,7 @@ let SwiftWin32 = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-log.git", - .uptoNextMajor(from: "1.4.3")), + .upToNextMajor(from: "1.4.3")), .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.0")), .package(url: "https://github.com/compnerd/cassowary.git", branch: "main"), From cda1bd63e5c5ab043ddacec1974cb9f1b7eb9c88 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 21 Oct 2023 11:51:30 -0700 Subject: [PATCH 3/3] Update Package@swift-5.4.swift --- Package@swift-5.4.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift index d01b28dc..5ff5f6d1 100644 --- a/Package@swift-5.4.swift +++ b/Package@swift-5.4.swift @@ -12,7 +12,7 @@ let SwiftWin32 = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-log.git", - .uptoNextMajor(from: "1.4.3")), + .upToNextMajor(from: "1.4.3")), .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.0")), .package(url: "https://github.com/compnerd/cassowary.git", .branch("main")),