From ee1fc93b7cfbf70392d7848207dfc9e046f6bdec Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Wed, 16 Oct 2024 17:19:14 -0700 Subject: [PATCH] Remove dependency on ISDBTestSupport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We weren’t using it anymore anyway. --- Package.swift | 2 -- Sources/SKTestSupport/BuildServerTestProject.swift | 4 ++-- .../BuildServerBuildSystemTests.swift | 1 - .../LegacyBuildServerBuildSystemTests.swift | 1 - Tests/SourceKitDTests/CrashRecoveryTests.swift | 1 - Tests/SourceKitDTests/SourceKitDTests.swift | 1 - Tests/SourceKitLSPTests/CallHierarchyTests.swift | 1 - Tests/SourceKitLSPTests/ImplementationTests.swift | 1 - Tests/SourceKitLSPTests/SwiftInterfaceTests.swift | 1 - Tests/SourceKitLSPTests/TypeHierarchyTests.swift | 1 - 10 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index f04c228ff..554c7f7a4 100644 --- a/Package.swift +++ b/Package.swift @@ -307,7 +307,6 @@ let package = Package( "SourceKitLSP", "SwiftExtensions", "ToolchainRegistry", - .product(name: "ISDBTestSupport", package: "indexstore-db"), .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"), ], resources: [.copy("INPUTS")], @@ -384,7 +383,6 @@ let package = Package( "SourceKitLSP", "ToolchainRegistry", .product(name: "IndexStoreDB", package: "indexstore-db"), - .product(name: "ISDBTestSupport", package: "indexstore-db"), .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"), // Depend on `SwiftCompilerPlugin` and `SwiftSyntaxMacros` so the modules are built before running tests and can // be used by test cases that test macros (see `SwiftPMTestProject.macroPackageManifest`) diff --git a/Sources/SKTestSupport/BuildServerTestProject.swift b/Sources/SKTestSupport/BuildServerTestProject.swift index d4eb6c87d..53389f965 100644 --- a/Sources/SKTestSupport/BuildServerTestProject.swift +++ b/Sources/SKTestSupport/BuildServerTestProject.swift @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// import Foundation -import ISDBTestSupport import XCTest fileprivate let sdkArgs = @@ -37,7 +36,8 @@ private let skTestSupportInputsDirectory: URL = { resources.deleteLastPathComponent() } #else - let resources = XCTestCase.productsDirectory + let resources = + productsDirectory .appendingPathComponent("SourceKitLSP_SKTestSupport.resources") #endif guard FileManager.default.fileExists(atPath: resources.path) else { diff --git a/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift index 527baed02..492c9f7a1 100644 --- a/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift +++ b/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift @@ -13,7 +13,6 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation -import ISDBTestSupport import LanguageServerProtocol import SKSupport import SKTestSupport diff --git a/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift index 28ef39b38..14ab45437 100644 --- a/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift +++ b/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift @@ -13,7 +13,6 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation -import ISDBTestSupport import LanguageServerProtocol import SKSupport import SKTestSupport diff --git a/Tests/SourceKitDTests/CrashRecoveryTests.swift b/Tests/SourceKitDTests/CrashRecoveryTests.swift index 04788b559..17d798d5f 100644 --- a/Tests/SourceKitDTests/CrashRecoveryTests.swift +++ b/Tests/SourceKitDTests/CrashRecoveryTests.swift @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -import ISDBTestSupport import LanguageServerProtocol import SKLogging import SKSupport diff --git a/Tests/SourceKitDTests/SourceKitDTests.swift b/Tests/SourceKitDTests/SourceKitDTests.swift index a5aab5cc1..36b045ba5 100644 --- a/Tests/SourceKitDTests/SourceKitDTests.swift +++ b/Tests/SourceKitDTests/SourceKitDTests.swift @@ -12,7 +12,6 @@ import Csourcekitd import Foundation -import ISDBTestSupport import LanguageServerProtocol import SKSupport import SKTestSupport diff --git a/Tests/SourceKitLSPTests/CallHierarchyTests.swift b/Tests/SourceKitLSPTests/CallHierarchyTests.swift index 54f62202d..5e4ca2f99 100644 --- a/Tests/SourceKitLSPTests/CallHierarchyTests.swift +++ b/Tests/SourceKitLSPTests/CallHierarchyTests.swift @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -import ISDBTestSupport import LanguageServerProtocol import SKTestSupport import TSCBasic diff --git a/Tests/SourceKitLSPTests/ImplementationTests.swift b/Tests/SourceKitLSPTests/ImplementationTests.swift index 20c68d58e..32eacb664 100644 --- a/Tests/SourceKitLSPTests/ImplementationTests.swift +++ b/Tests/SourceKitLSPTests/ImplementationTests.swift @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -import ISDBTestSupport import LanguageServerProtocol import SKTestSupport import TSCBasic diff --git a/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift b/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift index 1dc69d09e..bf1ee04bf 100644 --- a/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift +++ b/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// import Foundation -import ISDBTestSupport import LanguageServerProtocol import SKLogging import SKSupport diff --git a/Tests/SourceKitLSPTests/TypeHierarchyTests.swift b/Tests/SourceKitLSPTests/TypeHierarchyTests.swift index 1b9433a9e..a1ed51a7b 100644 --- a/Tests/SourceKitLSPTests/TypeHierarchyTests.swift +++ b/Tests/SourceKitLSPTests/TypeHierarchyTests.swift @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -import ISDBTestSupport import LanguageServerProtocol import SKTestSupport import TSCBasic