From a76373c79e52355819cc489a09b16c6e59ec65e1 Mon Sep 17 00:00:00 2001 From: giginet Date: Mon, 16 Mar 2026 11:05:09 +0900 Subject: [PATCH] Update minimum dependency versions to latest releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump minimum version requirements for all dependencies: - swift-log: 1.5.2 → 1.10.1 - swift-collections: 1.0.4 → 1.4.0 - swift-argument-parser: 1.1.0 → 1.7.0 - swift-algorithms: 1.0.0 → 1.2.1 - Rainbow: 4.0.1 → 4.2.1 - SwiftyJSON: 5.0.0 → 5.0.2 - swift-async-operations: 0.4.0 → 0.5.0 - swift-docc-plugin: 1.3.0 → 1.4.6 Adapt to swift-collections 1.4.0 by replacing `import OrderedCollections` with `import Collections` and removing `OrderedCollections.` type prefixes. Co-Authored-By: Claude Opus 4.6 --- Package.swift | 16 ++++++++-------- Sources/ScipioKit/BuildOptions.swift | 2 +- .../ScipioKit/Producer/FrameworkProducer.swift | 8 ++++---- Sources/ScipioKit/Resolver/PackageResolver.swift | 2 +- Sources/ScipioKit/SwiftPM/topologicalSort.swift | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Package.swift b/Package.swift index 12f22540..42ed2ef6 100644 --- a/Package.swift +++ b/Package.swift @@ -26,21 +26,21 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-log.git", - from: "1.5.2"), + from: "1.10.1"), .package(url: "https://github.com/apple/swift-collections", - from: "1.0.4"), + from: "1.4.0"), .package(url: "https://github.com/apple/swift-argument-parser.git", - from: "1.1.0"), + from: "1.7.0"), .package(url: "https://github.com/apple/swift-algorithms.git", - from: "1.0.0"), + from: "1.2.1"), .package(url: "https://github.com/onevcat/Rainbow", - from: "4.0.1"), + from: "4.2.1"), .package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", - from: "5.0.0"), + from: "5.0.2"), .package(url: "https://github.com/giginet/PackageManifestKit", from: "0.2.0"), .package(url: "https://github.com/mtj0928/swift-async-operations.git", - from: "0.4.0"), + from: "0.5.0"), ], targets: [ .executableTarget( @@ -117,6 +117,6 @@ let isDevelopment = ProcessInfo.processInfo.environment["SCIPIO_DEVELOPMENT"] == // swift-docs is not needed for package users if isDevelopment { package.dependencies += [ - .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.3.0"), + .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.4.6"), ] } diff --git a/Sources/ScipioKit/BuildOptions.swift b/Sources/ScipioKit/BuildOptions.swift index a22c4967..542255ae 100644 --- a/Sources/ScipioKit/BuildOptions.swift +++ b/Sources/ScipioKit/BuildOptions.swift @@ -1,5 +1,5 @@ import Foundation -import OrderedCollections +import Collections struct BuildOptions: Hashable, Codable, Sendable { diff --git a/Sources/ScipioKit/Producer/FrameworkProducer.swift b/Sources/ScipioKit/Producer/FrameworkProducer.swift index dc432afe..e779bdab 100644 --- a/Sources/ScipioKit/Producer/FrameworkProducer.swift +++ b/Sources/ScipioKit/Producer/FrameworkProducer.swift @@ -126,7 +126,7 @@ struct FrameworkProducer { let targetBuildResult = await buildTargets(dependencyGraphToBuild) - let builtTargets: OrderedCollections.OrderedSet = switch targetBuildResult { + let builtTargets: OrderedSet = switch targetBuildResult { case .completed(let builtTargets), .interrupted(let builtTargets, _): builtTargets @@ -313,7 +313,7 @@ struct FrameworkProducer { } private func buildTargets(_ targets: DependencyGraph) async -> TargetBuildResult { - var builtTargets = OrderedCollections.OrderedSet() + var builtTargets = OrderedSet() do { var targets = targets @@ -334,8 +334,8 @@ struct FrameworkProducer { } private enum TargetBuildResult { - case interrupted(builtTargets: OrderedCollections.OrderedSet, error: any Error) - case completed(builtTargets: OrderedCollections.OrderedSet) + case interrupted(builtTargets: OrderedSet, error: any Error) + case completed(builtTargets: OrderedSet) } @discardableResult diff --git a/Sources/ScipioKit/Resolver/PackageResolver.swift b/Sources/ScipioKit/Resolver/PackageResolver.swift index df2964a6..8eb0c3be 100644 --- a/Sources/ScipioKit/Resolver/PackageResolver.swift +++ b/Sources/ScipioKit/Resolver/PackageResolver.swift @@ -1,6 +1,6 @@ import Foundation import PackageManifestKit -import OrderedCollections +import Collections import AsyncOperations import ScipioKitCore diff --git a/Sources/ScipioKit/SwiftPM/topologicalSort.swift b/Sources/ScipioKit/SwiftPM/topologicalSort.swift index 598bc708..fcc26f4a 100644 --- a/Sources/ScipioKit/SwiftPM/topologicalSort.swift +++ b/Sources/ScipioKit/SwiftPM/topologicalSort.swift @@ -11,7 +11,7 @@ // ===----------------------------------------------------------------------===// import Foundation -import OrderedCollections +import Collections func topologicalSort( _ nodes: [T], successors: (T) throws -> [T]