Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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"),
]
}
2 changes: 1 addition & 1 deletion Sources/ScipioKit/BuildOptions.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import OrderedCollections
import Collections

struct BuildOptions: Hashable, Codable, Sendable {

Expand Down
8 changes: 4 additions & 4 deletions Sources/ScipioKit/Producer/FrameworkProducer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ struct FrameworkProducer {

let targetBuildResult = await buildTargets(dependencyGraphToBuild)

let builtTargets: OrderedCollections.OrderedSet<CacheSystem.CacheTarget> = switch targetBuildResult {
let builtTargets: OrderedSet<CacheSystem.CacheTarget> = switch targetBuildResult {
case .completed(let builtTargets),
.interrupted(let builtTargets, _):
builtTargets
Expand Down Expand Up @@ -313,7 +313,7 @@ struct FrameworkProducer {
}

private func buildTargets(_ targets: DependencyGraph<CacheSystem.CacheTarget>) async -> TargetBuildResult {
var builtTargets = OrderedCollections.OrderedSet<CacheSystem.CacheTarget>()
var builtTargets = OrderedSet<CacheSystem.CacheTarget>()

do {
var targets = targets
Expand All @@ -334,8 +334,8 @@ struct FrameworkProducer {
}

private enum TargetBuildResult {
case interrupted(builtTargets: OrderedCollections.OrderedSet<CacheSystem.CacheTarget>, error: any Error)
case completed(builtTargets: OrderedCollections.OrderedSet<CacheSystem.CacheTarget>)
case interrupted(builtTargets: OrderedSet<CacheSystem.CacheTarget>, error: any Error)
case completed(builtTargets: OrderedSet<CacheSystem.CacheTarget>)
}

@discardableResult
Expand Down
2 changes: 1 addition & 1 deletion Sources/ScipioKit/Resolver/PackageResolver.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import PackageManifestKit
import OrderedCollections
import Collections
import AsyncOperations
import ScipioKitCore

Expand Down
2 changes: 1 addition & 1 deletion Sources/ScipioKit/SwiftPM/topologicalSort.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ===----------------------------------------------------------------------===//

import Foundation
import OrderedCollections
import Collections

func topologicalSort<T: Identifiable>(
_ nodes: [T], successors: (T) throws -> [T]
Expand Down