Skip to content

Commit e58cb99

Browse files
owenvowenv
committed
Prune SwiftExtensions
1 parent 677c3f0 commit e58cb99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+62
-563
lines changed

‎Package.swift‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ var products: [Product] = [
2020
.library(name: "LanguageServerProtocolTransport", targets: ["LanguageServerProtocolTransport"]),
2121
.library(name: "SKLogging", targets: ["SKLogging"]),
2222
.library(name: "_SKLoggingForPlugin", targets: ["_SKLoggingForPlugin"]),
23-
.library(name: "SwiftExtensions", targets: ["SwiftExtensions"]),
24-
.library(name: "_SwiftExtensionsForPlugin", targets: ["_SwiftExtensionsForPlugin"]),
23+
.library(name: "ToolsProtocolsSwiftExtensions", targets: ["ToolsProtocolsSwiftExtensions"]),
24+
.library(name: "_ToolsProtocolsSwiftExtensionsForPlugin", targets: ["_ToolsProtocolsSwiftExtensionsForPlugin"]),
2525
]
2626

2727
var targets: [Target] = [
@@ -86,7 +86,7 @@ var targets: [Target] = [
8686
"BuildServerProtocol",
8787
"LanguageServerProtocol",
8888
"SKLogging",
89-
"SwiftExtensions",
89+
"ToolsProtocolsSwiftExtensions",
9090
],
9191
exclude: ["CMakeLists.txt"],
9292
swiftSettings: globalSwiftSettings
@@ -107,7 +107,7 @@ var targets: [Target] = [
107107
.target(
108108
name: "SKLogging",
109109
dependencies: [
110-
"SwiftExtensions",
110+
"ToolsProtocolsSwiftExtensions",
111111
],
112112
exclude: ["CMakeLists.txt"],
113113
swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings
@@ -117,12 +117,12 @@ var targets: [Target] = [
117117
.target(
118118
name: "_SKLoggingForPlugin",
119119
dependencies: [
120-
"_SwiftExtensionsForPlugin"
120+
"_ToolsProtocolsSwiftExtensionsForPlugin"
121121
],
122122
exclude: ["CMakeLists.txt"],
123123
swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings + [
124124
.unsafeFlags([
125-
"-module-alias", "SwiftExtensions=_SwiftExtensionsForPlugin",
125+
"-module-alias", "ToolsProtocolsSwiftExtensions=_ToolsProtocolsSwiftExtensionsForPlugin",
126126
]),
127127
]
128128
),
@@ -144,34 +144,34 @@ var targets: [Target] = [
144144
"LanguageServerProtocol",
145145
"LanguageServerProtocolTransport",
146146
"SKLogging",
147-
"SwiftExtensions",
147+
"ToolsProtocolsSwiftExtensions",
148148
],
149149
swiftSettings: globalSwiftSettings
150150
),
151151

152-
// MARK: SwiftExtensions
152+
// MARK: ToolsProtocolsSwiftExtensions
153153

154154
.target(
155-
name: "SwiftExtensions",
155+
name: "ToolsProtocolsSwiftExtensions",
156156
dependencies: ["ToolsProtocolsCAtomics"],
157157
exclude: ["CMakeLists.txt"],
158158
swiftSettings: globalSwiftSettings
159159
),
160160

161-
// SourceKit-LSP SPI target. Builds SwiftExtensions with an alternate module name to avoid runtime type collisions.
161+
// SourceKit-LSP SPI target. Builds ToolsProtocolsSwiftExtensions with an alternate module name to avoid runtime type collisions.
162162
.target(
163-
name: "_SwiftExtensionsForPlugin",
163+
name: "_ToolsProtocolsSwiftExtensionsForPlugin",
164164
dependencies: ["ToolsProtocolsCAtomics"],
165165
exclude: ["CMakeLists.txt"],
166166
swiftSettings: globalSwiftSettings
167167
),
168168

169169
.testTarget(
170-
name: "SwiftExtensionsTests",
170+
name: "ToolsProtocolsSwiftExtensionsTests",
171171
dependencies: [
172172
"SKLogging",
173173
"ToolsProtocolsTestSupport",
174-
"SwiftExtensions",
174+
"ToolsProtocolsSwiftExtensions",
175175
],
176176
swiftSettings: globalSwiftSettings
177177
),

‎Sources/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ add_subdirectory(ToolsProtocolsCAtomics)
66
add_subdirectory(LanguageServerProtocol)
77
add_subdirectory(LanguageServerProtocolTransport)
88
add_subdirectory(SKLogging)
9-
add_subdirectory(SwiftExtensions)
9+
add_subdirectory(ToolsProtocolsSwiftExtensions)

‎Sources/LanguageServerProtocolTransport/BuildServerMessageDependencyTracker.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import BuildServerProtocol
1414
public import LanguageServerProtocol
1515
@_spi(SourceKitLSP) import SKLogging
16-
import SwiftExtensions
16+
import ToolsProtocolsSwiftExtensions
1717

1818
/// A lightweight way of describing tasks that are created from handling BSP
1919
/// requests or notifications for the purpose of dependency tracking.

‎Sources/LanguageServerProtocolTransport/JSONRPCConnection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public import Dispatch
1414
public import Foundation
1515
public import LanguageServerProtocol
1616
@_spi(SourceKitLSP) import SKLogging
17-
@_spi(SourceKitLSP) import SwiftExtensions
17+
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
1818

1919
#if canImport(Android)
2020
import Android

‎Sources/LanguageServerProtocolTransport/LocalConnection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Dispatch
1414
import Foundation
1515
public import LanguageServerProtocol
1616
@_spi(SourceKitLSP) import SKLogging
17-
@_spi(SourceKitLSP) import SwiftExtensions
17+
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
1818

1919
/// A connection between two message handlers in the same process.
2020
///

‎Sources/LanguageServerProtocolTransport/QueueBasedMessageHandler.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import Foundation
1414
public import LanguageServerProtocol
1515
@_spi(SourceKitLSP) import SKLogging
16-
@_spi(SourceKitLSP) public import SwiftExtensions
16+
@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions
1717

1818
/// Side structure in which `QueueBasedMessageHandler` can keep track of active requests etc.
1919
///

‎Sources/LanguageServerProtocolTransport/RequestAndReply.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import LanguageServerProtocol
14-
@_spi(SourceKitLSP) import SwiftExtensions
14+
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
1515

1616
/// A request and a callback that returns the request's reply
1717
public final class RequestAndReply<Params: RequestType>: Sendable {

‎Sources/SKLogging/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ set_target_properties(SKLogging PROPERTIES
1414
target_link_libraries(SKLogging PRIVATE
1515
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
1616
target_link_libraries(SKLogging PUBLIC
17-
SwiftExtensions)
17+
ToolsProtocolsSwiftExtensions)
1818

1919
add_library(SKLoggingForPlugin STATIC ${sources})
2020
set_target_properties(SKLoggingForPlugin PROPERTIES
2121
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
2222
target_compile_options(SKLoggingForPlugin PRIVATE
2323
$<$<COMPILE_LANGUAGE:Swift>:
24-
"SHELL:-module-alias SwiftExtensions=SwiftExtensionsForPlugin"
24+
"SHELL:-module-alias ToolsProtocolsSwiftExtensions=ToolsProtocolsSwiftExtensionsForPlugin"
2525
>)
2626
target_link_libraries(SKLoggingForPlugin PRIVATE
2727
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
2828
target_link_libraries(SKLoggingForPlugin PUBLIC
29-
SwiftExtensionsForPlugin)
29+
ToolsProtocolsSwiftExtensionsForPlugin)
3030

3131
set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS SKLogging)

‎Sources/SKLogging/LoggingScope.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Foundation
14-
@_spi(SourceKitLSP) import SwiftExtensions
14+
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
1515

1616
public final class LoggingScope {
1717

‎Sources/SKLogging/NonDarwinLogging.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@_spi(SourceKitLSP) public import SwiftExtensions
13+
@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions
1414

1515
#if canImport(Darwin)
1616
import Foundation

0 commit comments

Comments
 (0)