Rename SKCore to BuildSystemIntegration

Author: ahoppen

Documentation/Modules.md

@@ -8,6 +8,10 @@ Swift types to represent the [Build Server Protocol (BSP) specification, version
 
 FIXME: Add link for BSP and version
 
+### BuildSystemIntegration
+
+Defines the queries SourceKit-LSP can ask of a a build system, like getting compiler arguments for a file. Finding a target’s dependencies or preparing a target.
+
 ### CAtomics
 
 Implementation of atomics for Swift using C. Once we can raise our deployment target to use the `Atomic` type from the Swift standard library, this module should be removed.
@@ -42,31 +46,6 @@ A connection to or from a SourceKit-LSP server. Since message parsing can fail,
 
 Contains the interface with which SourceKit-LSP queries the semantic index, adding up-to-date checks on top of the indexstore-db API. Also implements the types that manage background indexing.
 
-### SKCore
-
-FIXME: Currently serves two independent purposes and should be split up into two modules
-
-#### BuildSystem
-
-Defines the queries SourceKit-LSP can ask of a a build system, like getting compiler arguments for a file. Finding a target’s dependencies or preparing a target.
-
-This includes:
-- BuildConfiguration.swift
-- BuildServerBuildSystem.swift
-- BuildSetup.swift
-- BuildSystem.swift
-- BuildSystemDelegate.swift
-- BuildSystemManager.swift
-- CompilationDatabase.swift
-- CompilationDatabaseBuildSystem.swift
-- FallbackBuildSystem.swift
-- FileBuildSettings.swift
-- IndexTaskID.swift
-- MainFilesProvider.swift
-- PathPrefixMapping.swift
-- SplitShellCommand.swift
-- WorkspaceType.swift
-
 ### SKLogging
 
 Types that are API-compatible with OSLog to allow logging to OSLog when building for Darwin platforms and logging to stderr or files on non-Darwin platforms. This should not be dependent on any LSP specific types and be portable to other packages.
@@ -86,7 +65,7 @@ Contains SourceKit-LSP-specific helper functions. These fall into three differen
 
 Implements the `BuildSystem` protocol for Swift packages.
 
-FIXME: Merge this into the BuildSystem module once SKCore is split.
+FIXME: Merge this into the BuildSystem module once BuildSystemIntegration is split.
 
 ### SKTestSupport
 

Package.swift

@@ -30,10 +30,10 @@ let package = Package(
     .executableTarget(
       name: "sourcekit-lsp",
       dependencies: [
+        "BuildSystemIntegration",
         "Diagnose",
         "LanguageServerProtocol",
         "LanguageServerProtocolJSONRPC",
-        "SKCore",
         "SKOptions",
         "SKSupport",
         "SourceKitLSP",
@@ -57,6 +57,38 @@ let package = Package(
       swiftSettings: strictConcurrencySettings
     ),
 
+    // MARK: BuildSystemIntegration
+
+    .target(
+      name: "BuildSystemIntegration",
+      dependencies: [
+        "BuildServerProtocol",
+        "LanguageServerProtocol",
+        "LanguageServerProtocolJSONRPC",
+        "SKLogging",
+        "SKOptions",
+        "SKSupport",
+        "SourceKitD",
+        "SwiftExtensions",
+        "ToolchainRegistry",
+        .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
+        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+      ],
+      exclude: ["CMakeLists.txt"],
+      swiftSettings: strictConcurrencySettings
+    ),
+
+    .testTarget(
+      name: "BuildSystemIntegrationTests",
+      dependencies: [
+        "BuildSystemIntegration",
+        "SKOptions",
+        "SKTestSupport",
+        "ToolchainRegistry",
+      ],
+      swiftSettings: strictConcurrencySettings
+    ),
+
     // MARK: CAtomics
 
     .target(
@@ -84,8 +116,8 @@ let package = Package(
     .target(
       name: "Diagnose",
       dependencies: [
+        "BuildSystemIntegration",
         "InProcessClient",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SKSupport",
@@ -106,8 +138,8 @@ let package = Package(
     .testTarget(
       name: "DiagnoseTests",
       dependencies: [
+        "BuildSystemIntegration",
         "Diagnose",
-        "SKCore",
         "SKLogging",
         "SKTestSupport",
         "SourceKitD",
@@ -122,8 +154,8 @@ let package = Package(
     .target(
       name: "InProcessClient",
       dependencies: [
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SourceKitLSP",
@@ -177,8 +209,8 @@ let package = Package(
     .target(
       name: "SemanticIndex",
       dependencies: [
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
-        "SKCore",
         "SKLogging",
         "SwiftExtensions",
         "ToolchainRegistry",
@@ -198,38 +230,6 @@ let package = Package(
       swiftSettings: strictConcurrencySettings
     ),
 
-    // MARK: SKCore
-
-    .target(
-      name: "SKCore",
-      dependencies: [
-        "BuildServerProtocol",
-        "LanguageServerProtocol",
-        "LanguageServerProtocolJSONRPC",
-        "SKLogging",
-        "SKOptions",
-        "SKSupport",
-        "SourceKitD",
-        "SwiftExtensions",
-        "ToolchainRegistry",
-        .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
-        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-      ],
-      exclude: ["CMakeLists.txt"],
-      swiftSettings: strictConcurrencySettings
-    ),
-
-    .testTarget(
-      name: "SKCoreTests",
-      dependencies: [
-        "SKCore",
-        "SKOptions",
-        "SKTestSupport",
-        "ToolchainRegistry",
-      ],
-      swiftSettings: strictConcurrencySettings
-    ),
-
     // MARK: SKLogging
 
     .target(
@@ -296,8 +296,8 @@ let package = Package(
       name: "SKSwiftPMWorkspace",
       dependencies: [
         "BuildServerProtocol",
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SwiftExtensions",
@@ -312,8 +312,8 @@ let package = Package(
     .testTarget(
       name: "SKSwiftPMWorkspaceTests",
       dependencies: [
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
-        "SKCore",
         "SKOptions",
         "SKSwiftPMWorkspace",
         "SKTestSupport",
@@ -330,11 +330,11 @@ let package = Package(
     .target(
       name: "SKTestSupport",
       dependencies: [
+        "BuildSystemIntegration",
         "CSKTestSupport",
         "InProcessClient",
         "LanguageServerProtocol",
         "LanguageServerProtocolJSONRPC",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SKSupport",
@@ -365,8 +365,8 @@ let package = Package(
     .testTarget(
       name: "SourceKitDTests",
       dependencies: [
+        "BuildSystemIntegration",
         "SourceKitD",
-        "SKCore",
         "SKTestSupport",
         "SwiftExtensions",
         "ToolchainRegistry",
@@ -380,10 +380,10 @@ let package = Package(
       name: "SourceKitLSP",
       dependencies: [
         "BuildServerProtocol",
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
         "LanguageServerProtocolJSONRPC",
         "SemanticIndex",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SKSupport",
@@ -411,9 +411,9 @@ let package = Package(
       name: "SourceKitLSPTests",
       dependencies: [
         "BuildServerProtocol",
+        "BuildSystemIntegration",
         "LanguageServerProtocol",
         "SemanticIndex",
-        "SKCore",
         "SKLogging",
         "SKOptions",
         "SKSupport",

Sources/SKCore/BuildServerBuildSystem.swift renamed to Sources/BuildSystemIntegration/BuildServerBuildSystem.swift

@@ -1,5 +1,5 @@
 
-add_library(SKCore STATIC
+add_library(BuildSystemIntegration STATIC
   BuildServerBuildSystem.swift
   BuildSystem.swift
   BuildSystemDelegate.swift
@@ -12,9 +12,9 @@ add_library(SKCore STATIC
   MainFilesProvider.swift
   PathPrefixMapping.swift
   SplitShellCommand.swift)
-set_target_properties(SKCore PROPERTIES
+set_target_properties(BuildSystemIntegration PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
-target_link_libraries(SKCore PUBLIC
+target_link_libraries(BuildSystemIntegration PUBLIC
   BuildServerProtocol
   LanguageServerProtocol
   LanguageServerProtocolJSONRPC