diff --git a/Package.swift b/Package.swift index 5a97c574e..6eb881256 100644 --- a/Package.swift +++ b/Package.swift @@ -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"], @@ -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( @@ -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"), @@ -160,6 +174,7 @@ var targets: [Target] = [ name: "Diagnose", dependencies: [ "BuildServerIntegration", + "Csourcekitd", "InProcessClient", "LanguageServerProtocolExtensions", "SKOptions", @@ -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"), @@ -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 @@ -197,9 +216,11 @@ 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"), @@ -207,7 +228,9 @@ var targets: [Target] = [ .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: [], ), @@ -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"], @@ -254,6 +281,7 @@ var targets: [Target] = [ dependencies: [ "BuildServerIntegration", "LanguageServerProtocolExtensions", + "SKOptions", "SwiftExtensions", "ToolchainRegistry", "TSCExtensions", @@ -261,6 +289,7 @@ var targets: [Target] = [ .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"], @@ -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"), ], @@ -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"), ], ), @@ -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"), @@ -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"), ], ), @@ -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"], @@ -423,6 +463,7 @@ var targets: [Target] = [ name: "SourceKitLSPTests", dependencies: [ "BuildServerIntegration", + "Csourcekitd", "LanguageServerProtocolExtensions", "SemanticIndex", "SKOptions", @@ -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", ]), ), @@ -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"), ], ), @@ -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"], ), @@ -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"), ], ), @@ -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"), ], ), diff --git a/Sources/BuildServerIntegration/CMakeLists.txt b/Sources/BuildServerIntegration/CMakeLists.txt index 68fe95c50..8a2f5a154 100644 --- a/Sources/BuildServerIntegration/CMakeLists.txt +++ b/Sources/BuildServerIntegration/CMakeLists.txt @@ -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 diff --git a/Sources/ClangLanguageService/CMakeLists.txt b/Sources/ClangLanguageService/CMakeLists.txt index f9ab7cd20..ddcd7e22f 100644 --- a/Sources/ClangLanguageService/CMakeLists.txt +++ b/Sources/ClangLanguageService/CMakeLists.txt @@ -19,6 +19,7 @@ target_link_libraries(ClangLanguageService PUBLIC target_link_libraries(ClangLanguageService PRIVATE BuildServerIntegration + IndexStoreDB LanguageServerProtocolExtensions SwiftToolsProtocols::LanguageServerProtocolTransport SwiftToolsProtocols::SKLogging diff --git a/Sources/Diagnose/CMakeLists.txt b/Sources/Diagnose/CMakeLists.txt index 24fba80a7..e8b145308 100644 --- a/Sources/Diagnose/CMakeLists.txt +++ b/Sources/Diagnose/CMakeLists.txt @@ -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 @@ -39,6 +44,8 @@ target_link_libraries(Diagnose PUBLIC SwiftSyntax::SwiftSyntax SwiftSyntax::SwiftParser TSCBasic + TSCLibc + TSCUtility ) target_link_libraries(Diagnose PRIVATE diff --git a/Sources/InProcessClient/CMakeLists.txt b/Sources/InProcessClient/CMakeLists.txt index eeb04c0d9..0c60326ec 100644 --- a/Sources/InProcessClient/CMakeLists.txt +++ b/Sources/InProcessClient/CMakeLists.txt @@ -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 diff --git a/Sources/SemanticIndex/CMakeLists.txt b/Sources/SemanticIndex/CMakeLists.txt index 2663c3c76..4712a2363 100644 --- a/Sources/SemanticIndex/CMakeLists.txt +++ b/Sources/SemanticIndex/CMakeLists.txt @@ -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 $<$>:Foundation>) diff --git a/Sources/SourceKitLSP/CMakeLists.txt b/Sources/SourceKitLSP/CMakeLists.txt index 1fa38d52f..988e641e6 100644 --- a/Sources/SourceKitLSP/CMakeLists.txt +++ b/Sources/SourceKitLSP/CMakeLists.txt @@ -53,6 +53,7 @@ target_link_libraries(SourceKitLSP PRIVATE SwiftToolsProtocols::LanguageServerProtocolTransport SwiftToolsProtocols::SKLogging SourceKitD + TSCBasic TSCExtensions $<$>:FoundationXML> ) diff --git a/Sources/SwiftSourceKitClientPlugin/CMakeLists.txt b/Sources/SwiftSourceKitClientPlugin/CMakeLists.txt index bfc696339..a6566795b 100644 --- a/Sources/SwiftSourceKitClientPlugin/CMakeLists.txt +++ b/Sources/SwiftSourceKitClientPlugin/CMakeLists.txt @@ -11,7 +11,7 @@ target_compile_options(SwiftSourceKitClientPlugin PRIVATE >) target_link_libraries(SwiftSourceKitClientPlugin PRIVATE Csourcekitd - SourceKitD + SourceKitDForPlugin SwiftExtensions SwiftToolsProtocols::_SKLoggingForPlugin SwiftSourceKitPluginCommon diff --git a/Sources/sourcekit-lsp/CMakeLists.txt b/Sources/sourcekit-lsp/CMakeLists.txt index 0a9c7550e..b054af568 100644 --- a/Sources/sourcekit-lsp/CMakeLists.txt +++ b/Sources/sourcekit-lsp/CMakeLists.txt @@ -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)