Skip to content

Remove unnecessary SwiftExtensions content #2

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

Merged
merged 1 commit into from
Oct 13, 2025
Merged

Remove unnecessary SwiftExtensions content #2

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
26 changes: 13 additions & 13 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ var products: [Product] = [
.library(name: "LanguageServerProtocolTransport", targets: ["LanguageServerProtocolTransport"]),
.library(name: "SKLogging", targets: ["SKLogging"]),
.library(name: "_SKLoggingForPlugin", targets: ["_SKLoggingForPlugin"]),
.library(name: "SwiftExtensions", targets: ["SwiftExtensions"]),
.library(name: "_SwiftExtensionsForPlugin", targets: ["_SwiftExtensionsForPlugin"]),
.library(name: "ToolsProtocolsSwiftExtensions", targets: ["ToolsProtocolsSwiftExtensions"]),
.library(name: "_ToolsProtocolsSwiftExtensionsForPlugin", targets: ["_ToolsProtocolsSwiftExtensionsForPlugin"]),
]

var targets: [Target] = [
Expand Down Expand Up @@ -86,7 +86,7 @@ var targets: [Target] = [
"BuildServerProtocol",
"LanguageServerProtocol",
"SKLogging",
"SwiftExtensions",
"ToolsProtocolsSwiftExtensions",
],
exclude: ["CMakeLists.txt"],
swiftSettings: globalSwiftSettings
Expand All @@ -107,7 +107,7 @@ var targets: [Target] = [
.target(
name: "SKLogging",
dependencies: [
"SwiftExtensions",
"ToolsProtocolsSwiftExtensions",
],
exclude: ["CMakeLists.txt"],
swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings
Expand All @@ -117,12 +117,12 @@ var targets: [Target] = [
.target(
name: "_SKLoggingForPlugin",
dependencies: [
"_SwiftExtensionsForPlugin"
"_ToolsProtocolsSwiftExtensionsForPlugin"
],
exclude: ["CMakeLists.txt"],
swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings + [
.unsafeFlags([
"-module-alias", "SwiftExtensions=_SwiftExtensionsForPlugin",
"-module-alias", "ToolsProtocolsSwiftExtensions=_ToolsProtocolsSwiftExtensionsForPlugin",
]),
]
),
Expand All @@ -144,34 +144,34 @@ var targets: [Target] = [
"LanguageServerProtocol",
"LanguageServerProtocolTransport",
"SKLogging",
"SwiftExtensions",
"ToolsProtocolsSwiftExtensions",
],
swiftSettings: globalSwiftSettings
),

// MARK: SwiftExtensions
// MARK: ToolsProtocolsSwiftExtensions

.target(
name: "SwiftExtensions",
name: "ToolsProtocolsSwiftExtensions",
dependencies: ["ToolsProtocolsCAtomics"],
exclude: ["CMakeLists.txt"],
swiftSettings: globalSwiftSettings
),

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

.testTarget(
name: "SwiftExtensionsTests",
name: "ToolsProtocolsSwiftExtensionsTests",
dependencies: [
"SKLogging",
"ToolsProtocolsTestSupport",
"SwiftExtensions",
"ToolsProtocolsSwiftExtensions",
],
swiftSettings: globalSwiftSettings
),
Expand Down
2 changes: 1 addition & 1 deletion Sources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ add_subdirectory(ToolsProtocolsCAtomics)
add_subdirectory(LanguageServerProtocol)
add_subdirectory(LanguageServerProtocolTransport)
add_subdirectory(SKLogging)
add_subdirectory(SwiftExtensions)
add_subdirectory(ToolsProtocolsSwiftExtensions)
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocolTransport/BuildServerMessageDependencyTracker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import BuildServerProtocol
public import LanguageServerProtocol
@_spi(SourceKitLSP) import SKLogging
import SwiftExtensions
import ToolsProtocolsSwiftExtensions

/// A lightweight way of describing tasks that are created from handling BSP
/// requests or notifications for the purpose of dependency tracking.
Expand Down
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocolTransport/JSONRPCConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public import Dispatch
public import Foundation
public import LanguageServerProtocol
@_spi(SourceKitLSP) import SKLogging
@_spi(SourceKitLSP) import SwiftExtensions
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions

#if canImport(Android)
import Android
Expand Down
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocolTransport/LocalConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Dispatch
import Foundation
public import LanguageServerProtocol
@_spi(SourceKitLSP) import SKLogging
@_spi(SourceKitLSP) import SwiftExtensions
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions

/// A connection between two message handlers in the same process.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocolTransport/QueueBasedMessageHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import Foundation
public import LanguageServerProtocol
@_spi(SourceKitLSP) import SKLogging
@_spi(SourceKitLSP) public import SwiftExtensions
@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions

/// Side structure in which `QueueBasedMessageHandler` can keep track of active requests etc.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocolTransport/RequestAndReply.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

public import LanguageServerProtocol
@_spi(SourceKitLSP) import SwiftExtensions
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions

/// A request and a callback that returns the request's reply
public final class RequestAndReply<Params: RequestType>: Sendable {
Expand Down
6 changes: 3 additions & 3 deletions Sources/SKLogging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ set_target_properties(SKLogging PROPERTIES
target_link_libraries(SKLogging PRIVATE
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
target_link_libraries(SKLogging PUBLIC
SwiftExtensions)
ToolsProtocolsSwiftExtensions)

add_library(SKLoggingForPlugin STATIC ${sources})
set_target_properties(SKLoggingForPlugin PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_compile_options(SKLoggingForPlugin PRIVATE
$<$<COMPILE_LANGUAGE:Swift>:
"SHELL:-module-alias SwiftExtensions=SwiftExtensionsForPlugin"
"SHELL:-module-alias ToolsProtocolsSwiftExtensions=ToolsProtocolsSwiftExtensionsForPlugin"
>)
target_link_libraries(SKLoggingForPlugin PRIVATE
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
target_link_libraries(SKLoggingForPlugin PUBLIC
SwiftExtensionsForPlugin)
ToolsProtocolsSwiftExtensionsForPlugin)

set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS SKLogging)
2 changes: 1 addition & 1 deletion Sources/SKLogging/LoggingScope.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

import Foundation
@_spi(SourceKitLSP) import SwiftExtensions
@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions

public final class LoggingScope {

Expand Down
2 changes: 1 addition & 1 deletion Sources/SKLogging/NonDarwinLogging.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

@_spi(SourceKitLSP) public import SwiftExtensions
@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions

#if canImport(Darwin)
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/SKLogging/SetGlobalLogFileHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

import RegexBuilder
import SwiftExtensions
import ToolsProtocolsSwiftExtensions

#if canImport(Darwin)
public import Foundation
Expand Down
19 changes: 0 additions & 19 deletions Sources/SwiftExtensions/Array+Safe.swift
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions Sources/SwiftExtensions/CMakeLists.txt
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions Sources/SwiftExtensions/Cache.swift
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions Sources/SwiftExtensions/CartesianProduct.swift
View file
Open in desktop

This file was deleted.

Loading