Skip to content

Add missing dependencies in Package.swift and CMakeLists.txt #2674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rintaro wants to merge 1 commit into
base: main
Choose a base branch
from
+90 −10
Open

Add missing dependencies in Package.swift and CMakeLists.txt #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 59 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ var targets: [Target] = [
name: "sourcekit-lsp",
dependencies: [
"BuildServerIntegration",
"Csourcekitd",
"Diagnose",
"InProcessClient",
"LanguageServerProtocolExtensions",
"SKOptions",
"SourceKitLSP",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
exclude: ["CMakeLists.txt"],
Expand Down Expand Up @@ -69,13 +72,23 @@ var targets: [Target] = [
name: "BuildServerIntegrationTests",
dependencies: [
"BuildServerIntegration",
"LanguageServerProtocolExtensions",
"SKOptions",
"SKTestSupport",
"SourceKitLSP",
"SwiftExtensions",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "BuildServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
],
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
]
+ swiftPMDependency([
.product(name: "SwiftPMDataModel-auto", package: "swift-package-manager")
]),
),

.target(
Expand All @@ -95,6 +108,7 @@ var targets: [Target] = [
"SwiftExtensions",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "IndexStoreDB", package: "indexstore-db"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
Expand Down Expand Up @@ -160,6 +174,7 @@ var targets: [Target] = [
name: "Diagnose",
dependencies: [
"BuildServerIntegration",
"Csourcekitd",
"InProcessClient",
"LanguageServerProtocolExtensions",
"SKOptions",
Expand All @@ -170,6 +185,8 @@ var targets: [Target] = [
"ToolchainRegistry",
"TSCExtensions",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
Expand All @@ -184,10 +201,12 @@ var targets: [Target] = [
"Diagnose",
"SKTestSupport",
"SourceKitD",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
]
+ swiftSyntaxDependencies(["SwiftSyntax"]),
),

// MARK: DocumentationLanguageService
Expand All @@ -197,17 +216,21 @@ var targets: [Target] = [
dependencies: [
"BuildServerIntegration",
"SemanticIndex",
"SKOptions",
"SKUtilities",
"SourceKitLSP",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "BuildServerProtocol", package: "swift-tools-protocols"),
.product(name: "IndexStoreDB", package: "indexstore-db"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "Markdown", package: "swift-markdown"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftDocC", package: "swift-docc"),
.product(name: "SymbolKit", package: "swift-docc-symbolkit"),
],
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
]
+ swiftSyntaxDependencies(["SwiftSyntax"]),
exclude: [],
),

Expand All @@ -219,13 +242,17 @@ var targets: [Target] = [
"BuildServerIntegration",
"ClangLanguageService",
"DocumentationLanguageService",
"LanguageServerProtocolExtensions",
"SKOptions",
"SourceKitLSP",
"SwiftExtensions",
"SwiftLanguageService",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
exclude: ["CMakeLists.txt"],
Expand Down Expand Up @@ -254,13 +281,15 @@ var targets: [Target] = [
dependencies: [
"BuildServerIntegration",
"LanguageServerProtocolExtensions",
"SKOptions",
"SwiftExtensions",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "BuildServerProtocol", package: "swift-tools-protocols"),
.product(name: "IndexStoreDB", package: "indexstore-db"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
exclude: ["CMakeLists.txt"],
Expand All @@ -271,6 +300,7 @@ var targets: [Target] = [
dependencies: [
"SemanticIndex",
"SKTestSupport",
"SwiftExtensions",
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
Expand Down Expand Up @@ -319,8 +349,11 @@ var targets: [Target] = [
.testTarget(
name: "SKUtilitiesTests",
dependencies: [
"SKUtilities",
"SKTestSupport",
"SKUtilities",
"SwiftExtensions",
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
),

Expand All @@ -342,6 +375,7 @@ var targets: [Target] = [
"SwiftLanguageService",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "BuildServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
Expand Down Expand Up @@ -386,10 +420,15 @@ var targets: [Target] = [
name: "SourceKitDTests",
dependencies: [
"BuildServerIntegration",
"SourceKitD",
"Csourcekitd",
"LanguageServerProtocolExtensions",
"SKTestSupport",
"SourceKitD",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
),
Expand All @@ -414,6 +453,7 @@ var targets: [Target] = [
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "Markdown", package: "swift-markdown"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
] + swiftSyntaxDependencies(["SwiftSyntax"]),
exclude: ["CMakeLists.txt"],
Expand All @@ -423,6 +463,7 @@ var targets: [Target] = [
name: "SourceKitLSPTests",
dependencies: [
"BuildServerIntegration",
"Csourcekitd",
"LanguageServerProtocolExtensions",
"SemanticIndex",
"SKOptions",
Expand All @@ -434,15 +475,18 @@ var targets: [Target] = [
"SwiftLanguageService",
"SwiftSyntaxCodeActions",
"ToolchainRegistry",
"TSCExtensions",
.product(name: "BuildServerProtocol", package: "swift-tools-protocols"),
.product(name: "IndexStoreDB", package: "indexstore-db"),
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftDocC", package: "swift-docc"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
]
+ swiftSyntaxDependencies([
"SwiftIfConfig", "SwiftParser", "SwiftSyntax",
"SwiftBasicFormat", "SwiftIfConfig", "SwiftParser", "SwiftRefactor", "SwiftSyntax", "SwiftSyntaxBuilder",
]),
),

Expand Down Expand Up @@ -614,11 +658,13 @@ var targets: [Target] = [
"BuildServerIntegration",
"CompletionScoring",
"Csourcekitd",
"SKOptions",
"SKTestSupport",
"SourceKitD",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
.product(name: "SKLogging", package: "swift-tools-protocols"),
],
),

Expand All @@ -631,6 +677,8 @@ var targets: [Target] = [
"SwiftExtensions",
"TSCExtensions",
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
exclude: ["CMakeLists.txt"],
),
Expand All @@ -639,7 +687,11 @@ var targets: [Target] = [
name: "ToolchainRegistryTests",
dependencies: [
"SKTestSupport",
"SKUtilities",
"SwiftExtensions",
"ToolchainRegistry",
.product(name: "SKLogging", package: "swift-tools-protocols"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
),

Expand All @@ -662,6 +714,7 @@ var targets: [Target] = [
"SKTestSupport",
"SwiftExtensions",
"TSCExtensions",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
],
),
Expand Down
12 changes: 9 additions & 3 deletions Sources/BuildServerIntegration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,17 @@ target_link_libraries(BuildServerIntegration PUBLIC
SwiftExtensions
SwiftToolsProtocols::ToolsProtocolsSwiftExtensions
ToolchainRegistry
PackageModel
TSCBasic
Basics
Build
PackageGraph
PackageLoading
PackageModel
SourceControl
SourceKitLSPAPI
SwiftASN1)
SPMBuildCore
SwiftASN1
TSCBasic
Workspace)

target_link_libraries(BuildServerIntegration PRIVATE
SKUtilities
Expand Down
1 change: 1 addition & 0 deletions Sources/ClangLanguageService/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ target_link_libraries(ClangLanguageService PUBLIC

target_link_libraries(ClangLanguageService PRIVATE
BuildServerIntegration
IndexStoreDB
LanguageServerProtocolExtensions
SwiftToolsProtocols::LanguageServerProtocolTransport
SwiftToolsProtocols::SKLogging
Expand Down
7 changes: 7 additions & 0 deletions Sources/Diagnose/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ set_target_properties(Diagnose PROPERTIES

target_link_libraries(Diagnose PUBLIC
BuildServerIntegration
Csourcekitd
InProcessClient
LanguageServerProtocolExtensions
SwiftToolsProtocols::LanguageServerProtocol
SwiftToolsProtocols::LanguageServerProtocolTransport
SwiftToolsProtocols::SKLogging
SKOptions
SourceKitD
SourceKitLSP
SwiftExtensions
SwiftToolsProtocols::ToolsProtocolsSwiftExtensions
ToolchainRegistry
Expand All @@ -39,6 +44,8 @@ target_link_libraries(Diagnose PUBLIC
SwiftSyntax::SwiftSyntax
SwiftSyntax::SwiftParser
TSCBasic
TSCLibc
TSCUtility
)

target_link_libraries(Diagnose PRIVATE
Expand Down
5 changes: 5 additions & 0 deletions Sources/InProcessClient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@ target_link_libraries(InProcessClient PUBLIC
BuildServerIntegration
ClangLanguageService
Crypto
LanguageServerProtocolExtensions
SwiftToolsProtocols::LanguageServerProtocol
SwiftToolsProtocols::LanguageServerProtocolTransport
SwiftToolsProtocols::SKLogging
SKOptions
SourceKitLSP
SwiftExtensions
SwiftLanguageService
SwiftToolsProtocols::ToolsProtocolsSwiftExtensions
ToolchainRegistry
TSCBasic
)

target_link_libraries(InProcessClient PRIVATE
Expand Down
4 changes: 4 additions & 0 deletions Sources/SemanticIndex/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ set_target_properties(SemanticIndex PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_link_libraries(SemanticIndex PRIVATE
BuildServerIntegration
SwiftToolsProtocols::BuildServerProtocol
LanguageServerProtocolExtensions
SwiftToolsProtocols::LanguageServerProtocol
SwiftToolsProtocols::SKLogging
SKOptions
SwiftExtensions
SwiftToolsProtocols::ToolsProtocolsSwiftExtensions
ToolchainRegistry
TSCBasic
TSCExtensions
IndexStoreDB
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
1 change: 1 addition & 0 deletions Sources/SourceKitLSP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ target_link_libraries(SourceKitLSP PRIVATE
SwiftToolsProtocols::LanguageServerProtocolTransport
SwiftToolsProtocols::SKLogging
SourceKitD
TSCBasic
TSCExtensions
$<$<NOT:$<PLATFORM_ID:Darwin>>:FoundationXML>
)
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftSourceKitClientPlugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ target_compile_options(SwiftSourceKitClientPlugin PRIVATE
>)
target_link_libraries(SwiftSourceKitClientPlugin PRIVATE
Csourcekitd
SourceKitD
SourceKitDForPlugin
Copy link
Copy Markdown
Member Author

@rintaro rintaro May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this was just a mistake.

SwiftExtensions
SwiftToolsProtocols::_SKLoggingForPlugin
SwiftSourceKitPluginCommon
Expand Down
3 changes: 3 additions & 0 deletions Sources/sourcekit-lsp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ add_executable(sourcekit-lsp
SourceKitLSP.swift)
target_link_libraries(sourcekit-lsp PRIVATE
BuildServerIntegration
Csourcekitd
Diagnose
InProcessClient
SwiftToolsProtocols::LanguageServerProtocol
LanguageServerProtocolExtensions
SwiftToolsProtocols::LanguageServerProtocolTransport
SemanticIndex
SwiftToolsProtocols::SKLogging
SKOptions
SourceKitLSP
SwiftExtensions
ToolchainRegistry
ArgumentParser
TSCBasic)
Expand Down