Skip to content

Commit c424a89

Browse files
committed
build: synchronise dependencies with reality
This adjusts the dependency graph to match the reality of the sources.
1 parent 22209f9 commit c424a89

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Package.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,8 @@ let package = Package(
489489
name: "CoreCommands",
490490
dependencies: [
491491
.product(name: "ArgumentParser", package: "swift-argument-parser"),
492+
.product(name: "TSCBasic", package: "swift-tools-support-core"),
493+
.product(name: "TSCUtility", package: "swift-tools-support-core"),
492494
"Basics",
493495
"Build",
494496
"PackageLoading",
@@ -509,9 +511,12 @@ let package = Package(
509511
dependencies: [
510512
.product(name: "ArgumentParser", package: "swift-argument-parser"),
511513
.product(name: "OrderedCollections", package: "swift-collections"),
514+
.product(name: "TSCBasic", package: "swift-tools-support-core"),
515+
.product(name: "TSCUtility", package: "swift-tools-support-core"),
512516
"Basics",
513517
"Build",
514518
"CoreCommands",
519+
"LLBuildManifest",
515520
"PackageGraph",
516521
"PackageModelSyntax",
517522
"SourceControl",
@@ -594,7 +599,7 @@ let package = Package(
594599
.executableTarget(
595600
/** The main executable provided by SwiftPM */
596601
name: "swift-package",
597-
dependencies: ["Basics", "Commands"],
602+
dependencies: ["Commands"],
598603
exclude: ["CMakeLists.txt"]
599604
),
600605
.executableTarget(

Sources/CoreCommands/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ target_link_libraries(CoreCommands PUBLIC
1616
Basics
1717
Build
1818
PackageGraph
19+
PackageModel
20+
PackageLoading
1921
TSCBasic
2022
TSCUtility
2123
Workspace

Sources/swift-package/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
add_executable(swift-package
1010
Entrypoint.swift)
1111
target_link_libraries(swift-package PRIVATE
12-
Commands
13-
TSCBasic)
12+
Commands)
1413

1514
target_compile_options(swift-package PRIVATE
1615
-parse-as-library)

0 commit comments

Comments
 (0)