diff --git a/Benchmarks/Benchmarks/PackageGraphBenchmarks/PackageGraphBenchmarks.swift b/Benchmarks/Benchmarks/PackageGraphBenchmarks/PackageGraphBenchmarks.swift index bab1f4af582..09460dbd7e5 100644 --- a/Benchmarks/Benchmarks/PackageGraphBenchmarks/PackageGraphBenchmarks.swift +++ b/Benchmarks/Benchmarks/PackageGraphBenchmarks/PackageGraphBenchmarks.swift @@ -7,7 +7,6 @@ import PackageModel @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly) import func PackageGraph.loadModulesGraph -import class TSCBasic.InMemoryFileSystem import Workspace let benchmarks = { diff --git a/Sources/Basics/SQLiteBackedCache.swift b/Sources/Basics/SQLiteBackedCache.swift index 373755bd39b..129b84e2f3d 100644 --- a/Sources/Basics/SQLiteBackedCache.swift +++ b/Sources/Basics/SQLiteBackedCache.swift @@ -13,7 +13,6 @@ import Foundation import protocol TSCBasic.Closable -import class TSCBasic.InMemoryFileSystem import var TSCBasic.localFileSystem /// SQLite backed persistent cache. diff --git a/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift b/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift index 071080b4c10..2acac6a2703 100644 --- a/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift +++ b/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2020-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -20,7 +20,6 @@ import struct Foundation.URL import PackageModel import protocol TSCBasic.Closable -import class TSCBasic.InMemoryFileSystem final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable { private static let packageCollectionsTableName = "package_collections" diff --git a/Sources/Workspace/PackageContainer/RegistryPackageContainer.swift b/Sources/Workspace/PackageContainer/RegistryPackageContainer.swift index fc5d451c8c4..7829941a185 100644 --- a/Sources/Workspace/PackageContainer/RegistryPackageContainer.swift +++ b/Sources/Workspace/PackageContainer/RegistryPackageContainer.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -17,8 +17,6 @@ import PackageLoading import PackageModel import PackageRegistry -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version public class RegistryPackageContainer: PackageContainer { diff --git a/Sources/Workspace/Workspace+Editing.swift b/Sources/Workspace/Workspace+Editing.swift index cf429ad2eaa..c2220479695 100644 --- a/Sources/Workspace/Workspace+Editing.swift +++ b/Sources/Workspace/Workspace+Editing.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -11,13 +11,13 @@ //===----------------------------------------------------------------------===// import struct Basics.AbsolutePath +import class Basics.InMemoryFileSystem import class Basics.ObservabilityScope import struct Basics.RelativePath import func Basics.temp_await import struct PackageGraph.PackageGraphRootInput import struct PackageModel.ProvidedLibrary import struct SourceControl.Revision -import class TSCBasic.InMemoryFileSystem extension Workspace { /// Edit implementation. diff --git a/Sources/Workspace/Workspace.swift b/Sources/Workspace/Workspace.swift index 92e8728c725..07a78116841 100644 --- a/Sources/Workspace/Workspace.swift +++ b/Sources/Workspace/Workspace.swift @@ -23,7 +23,6 @@ import SourceControl import func TSCBasic.findCycle import protocol TSCBasic.HashAlgorithm -import class TSCBasic.InMemoryFileSystem import struct TSCBasic.KeyedPair import struct TSCBasic.SHA256 import var TSCBasic.stderrStream diff --git a/Sources/_InternalTestSupport/MockPackageGraphs.swift b/Sources/_InternalTestSupport/MockPackageGraphs.swift index 86dba2bbfd3..ba576b84b4c 100644 --- a/Sources/_InternalTestSupport/MockPackageGraphs.swift +++ b/Sources/_InternalTestSupport/MockPackageGraphs.swift @@ -11,6 +11,7 @@ //===----------------------------------------------------------------------===// import struct Basics.AbsolutePath +import class Basics.InMemoryFileSystem import class Basics.ObservabilitySystem import class Basics.ObservabilityScope @@ -24,7 +25,6 @@ import struct PackageModel.ProductDescription import enum PackageModel.ProductType import struct PackageModel.TargetDescription import protocol TSCBasic.FileSystem -import class TSCBasic.InMemoryFileSystem package typealias MockPackageGraph = ( graph: ModulesGraph, diff --git a/Tests/BasicsTests/Archiver/TarArchiverTests.swift b/Tests/BasicsTests/Archiver/TarArchiverTests.swift index ac293583a52..b330e4599c9 100644 --- a/Tests/BasicsTests/Archiver/TarArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/TarArchiverTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,7 +15,6 @@ import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem import struct TSCBasic.FileSystemError final class TarArchiverTests: XCTestCase { diff --git a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift index dd5511133c3..6c7c4249605 100644 --- a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,7 +15,6 @@ import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem import struct TSCBasic.FileSystemError final class UniversalArchiverTests: XCTestCase { diff --git a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift index 936a0935971..c8a5e113f0b 100644 --- a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2022 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,10 +15,9 @@ import _InternalTestSupport import XCTest import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported -import class TSCBasic.InMemoryFileSystem import struct TSCBasic.FileSystemError -class ZipArchiverTests: XCTestCase { +final class ZipArchiverTests: XCTestCase { func testZipArchiverSuccess() async throws { try await testWithTemporaryDirectory { tmpdir in let archiver = ZipArchiver(fileSystem: localFileSystem) diff --git a/Tests/BasicsTests/FileSystem/FileSystemTests.swift b/Tests/BasicsTests/FileSystem/FileSystemTests.swift index 8f32cbf92f5..32c6ddb121d 100644 --- a/Tests/BasicsTests/FileSystem/FileSystemTests.swift +++ b/Tests/BasicsTests/FileSystem/FileSystemTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -10,13 +10,10 @@ // //===----------------------------------------------------------------------===// - @testable import Basics import TSCTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - final class FileSystemTests: XCTestCase { func testStripFirstLevelComponent() throws { let fileSystem = InMemoryFileSystem() diff --git a/Tests/BasicsTests/SandboxTests.swift b/Tests/BasicsTests/SandboxTests.swift index 8e59db28a85..0cd00b62b51 100644 --- a/Tests/BasicsTests/SandboxTests.swift +++ b/Tests/BasicsTests/SandboxTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021-2022 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -18,10 +18,6 @@ import XCTest import Darwin #endif -import class TSCBasic.InMemoryFileSystem -import class Basics.AsyncProcess -import struct Basics.AsyncProcessResult - final class SandboxTest: XCTestCase { func testSandboxOnAllPlatforms() throws { try withTemporaryDirectory { path in diff --git a/Tests/BuildTests/BuildOperationTests.swift b/Tests/BuildTests/BuildOperationTests.swift index 58e42e1aa04..ac23499816a 100644 --- a/Tests/BuildTests/BuildOperationTests.swift +++ b/Tests/BuildTests/BuildOperationTests.swift @@ -23,7 +23,6 @@ import _InternalTestSupport import XCTest import class TSCBasic.BufferedOutputByteStream -import class TSCBasic.InMemoryFileSystem private func mockBuildOperation( productsBuildParameters: BuildParameters, diff --git a/Tests/BuildTests/CrossCompilationBuildPlanTests.swift b/Tests/BuildTests/CrossCompilationBuildPlanTests.swift index 5a6b42b66e0..c48d19fb5cd 100644 --- a/Tests/BuildTests/CrossCompilationBuildPlanTests.swift +++ b/Tests/BuildTests/CrossCompilationBuildPlanTests.swift @@ -11,6 +11,7 @@ //===----------------------------------------------------------------------===// import struct Basics.AbsolutePath +import class Basics.InMemoryFileSystem import class Basics.ObservabilitySystem import class Build.BuildPlan import class Build.ProductBuildDescription @@ -35,7 +36,6 @@ import func _InternalTestSupport.trivialPackageGraph import struct _InternalTestSupport.BuildPlanResult import func _InternalTestSupport.XCTAssertMatch import func _InternalTestSupport.XCTAssertNoDiagnostics -import class TSCBasic.InMemoryFileSystem import XCTest diff --git a/Tests/BuildTests/LLBuildManifestBuilderTests.swift b/Tests/BuildTests/LLBuildManifestBuilderTests.swift index 70cafaf35fb..f19a8225f1b 100644 --- a/Tests/BuildTests/LLBuildManifestBuilderTests.swift +++ b/Tests/BuildTests/LLBuildManifestBuilderTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2015-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2015-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -23,7 +23,6 @@ import struct SPMBuildCore.BuildParameters @_spi(SwiftPMInternal) import _InternalTestSupport -import class TSCBasic.InMemoryFileSystem import XCTest final class LLBuildManifestBuilderTests: XCTestCase { diff --git a/Tests/BuildTests/ModuleAliasingBuildTests.swift b/Tests/BuildTests/ModuleAliasingBuildTests.swift index d29a118e41b..efc19f4225c 100644 --- a/Tests/BuildTests/ModuleAliasingBuildTests.swift +++ b/Tests/BuildTests/ModuleAliasingBuildTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2022 Apple Inc. and the Swift project authors +// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -24,8 +24,6 @@ import SwiftDriver import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - final class ModuleAliasingBuildTests: XCTestCase { func testModuleAliasingEmptyAlias() throws { let fs = InMemoryFileSystem( diff --git a/Tests/BuildTests/ProductBuildDescriptionTests.swift b/Tests/BuildTests/ProductBuildDescriptionTests.swift index 47e12c627c5..ffbefbcf3aa 100644 --- a/Tests/BuildTests/ProductBuildDescriptionTests.swift +++ b/Tests/BuildTests/ProductBuildDescriptionTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -13,8 +13,8 @@ @testable import Build +import class Basics.InMemoryFileSystem import class Basics.ObservabilitySystem -import class TSCBasic.InMemoryFileSystem import class PackageModel.Manifest import struct PackageModel.TargetDescription diff --git a/Tests/CommandsTests/MermaidPackageSerializerTests.swift b/Tests/CommandsTests/MermaidPackageSerializerTests.swift index 442adf9704a..f8c0900d844 100644 --- a/Tests/CommandsTests/MermaidPackageSerializerTests.swift +++ b/Tests/CommandsTests/MermaidPackageSerializerTests.swift @@ -10,6 +10,7 @@ // //===----------------------------------------------------------------------===// +import class Basics.InMemoryFileSystem import class Basics.ObservabilitySystem @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly) @@ -18,7 +19,6 @@ import func PackageGraph.loadModulesGraph import class PackageModel.Manifest import struct PackageModel.ProductDescription import struct PackageModel.TargetDescription -import class TSCBasic.InMemoryFileSystem import func _InternalTestSupport.XCTAssertNoDiagnostics @testable diff --git a/Tests/CommandsTests/MultiRootSupportTests.swift b/Tests/CommandsTests/MultiRootSupportTests.swift index 6a5c1778905..3ef6ba655d8 100644 --- a/Tests/CommandsTests/MultiRootSupportTests.swift +++ b/Tests/CommandsTests/MultiRootSupportTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2019 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,10 +16,7 @@ import _InternalTestSupport import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - final class MultiRootSupportTests: CommandsTestCase { - func testWorkspaceLoader() throws { let fs = InMemoryFileSystem(emptyFiles: [ "/tmp/test/dep/Package.swift", diff --git a/Tests/CommandsTests/PackageCommandTests.swift b/Tests/CommandsTests/PackageCommandTests.swift index 9053ad23aae..4b7a19f553c 100644 --- a/Tests/CommandsTests/PackageCommandTests.swift +++ b/Tests/CommandsTests/PackageCommandTests.swift @@ -27,7 +27,6 @@ import XCTest import struct TSCBasic.ByteString import class TSCBasic.BufferedOutputByteStream -import class TSCBasic.InMemoryFileSystem import enum TSCBasic.JSON import class Basics.AsyncProcess diff --git a/Tests/FunctionalTests/ModuleMapTests.swift b/Tests/FunctionalTests/ModuleMapTests.swift index ec78dac0380..149fb181082 100644 --- a/Tests/FunctionalTests/ModuleMapTests.swift +++ b/Tests/FunctionalTests/ModuleMapTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information diff --git a/Tests/LLBuildManifestTests/LLBuildManifestTests.swift b/Tests/LLBuildManifestTests/LLBuildManifestTests.swift index e546e7b065a..9e7e822248b 100644 --- a/Tests/LLBuildManifestTests/LLBuildManifestTests.swift +++ b/Tests/LLBuildManifestTests/LLBuildManifestTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -11,13 +11,12 @@ //===----------------------------------------------------------------------===// import struct Basics.AbsolutePath +import class Basics.InMemoryFileSystem import class Foundation.PropertyListDecoder @testable import LLBuildManifest import _InternalTestSupport -import class TSCBasic.InMemoryFileSystem import XCTest - private let testEntitlement = "test-entitlement" final class LLBuildManifestTests: XCTestCase { diff --git a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift index 7b44c4cdfc7..d68009b0f7f 100644 --- a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift +++ b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2020 Apple Inc. and the Swift project authors +// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,8 +15,6 @@ import Basics import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - final class PackageCollectionsSourcesStorageTest: XCTestCase { func testHappyCase() async throws { let mockFileSystem = InMemoryFileSystem() diff --git a/Tests/PackageCollectionsTests/PackageIndexConfigurationTests.swift b/Tests/PackageCollectionsTests/PackageIndexConfigurationTests.swift index 869a48c14bc..56db6fead40 100644 --- a/Tests/PackageCollectionsTests/PackageIndexConfigurationTests.swift +++ b/Tests/PackageCollectionsTests/PackageIndexConfigurationTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2022 Apple Inc. and the Swift project authors +// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -10,12 +10,11 @@ // //===----------------------------------------------------------------------===// +import class Basics.InMemoryFileSystem import PackageCollections import XCTest -import class TSCBasic.InMemoryFileSystem - -class PackageIndexConfigurationTests: XCTestCase { +final class PackageIndexConfigurationTests: XCTestCase { func testSaveAndLoad() throws { let url = URL("https://package-index.test") let configuration = PackageIndexConfiguration(url: url) diff --git a/Tests/PackageCollectionsTests/Utility.swift b/Tests/PackageCollectionsTests/Utility.swift index 33477bd6ba5..df7060bc4d7 100644 --- a/Tests/PackageCollectionsTests/Utility.swift +++ b/Tests/PackageCollectionsTests/Utility.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2020-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -20,8 +20,6 @@ import PackageCollectionsSigning import PackageModel import SourceControl -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version func makeMockSources(count: Int = Int.random(in: 5 ... 10)) -> [PackageCollectionsModel.CollectionSource] { diff --git a/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift b/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift index 1555353490a..34e601ce7d3 100644 --- a/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift +++ b/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -17,8 +17,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version final class FilePackageFingerprintStorageTests: XCTestCase { diff --git a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift index 885d6223f79..a6e086edec0 100644 --- a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift +++ b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -21,8 +21,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - import class TSCTestSupport.XCTestCasePerf final class PackageGraphPerfTests: XCTestCasePerf { diff --git a/Tests/PackageGraphTests/ModulesGraphTests.swift b/Tests/PackageGraphTests/ModulesGraphTests.swift index 3aad4251177..a27f345cae5 100644 --- a/Tests/PackageGraphTests/ModulesGraphTests.swift +++ b/Tests/PackageGraphTests/ModulesGraphTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -20,7 +20,6 @@ import _InternalTestSupport import XCTest import struct TSCBasic.ByteString -import class TSCBasic.InMemoryFileSystem final class ModulesGraphTests: XCTestCase { func testBasic() throws { diff --git a/Tests/PackageGraphTests/PubgrubTests.swift b/Tests/PackageGraphTests/PubgrubTests.swift index e3a5a8b436c..66759152546 100644 --- a/Tests/PackageGraphTests/PubgrubTests.swift +++ b/Tests/PackageGraphTests/PubgrubTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -19,8 +19,6 @@ import SourceControl import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version // There's some useful helper utilities defined below for easier testing: diff --git a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift index 942fae3bd80..53b4736d527 100644 --- a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift +++ b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift @@ -16,8 +16,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - @available(macOS 13, iOS 16, tvOS 16, watchOS 9, *) final class ManifestLoaderCacheTests: XCTestCase { diff --git a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift index f951e425c7e..b57fa666e3d 100644 --- a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift +++ b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2020 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,10 +16,7 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - -class ModuleMapGeneration: XCTestCase { - +final class ModuleMapGeneration: XCTestCase { func testModuleNameHeaderInInclude() throws { let root: AbsolutePath = .root diff --git a/Tests/PackageLoadingTests/PDLoadingTests.swift b/Tests/PackageLoadingTests/PDLoadingTests.swift index b3970079313..0ceab38b4e0 100644 --- a/Tests/PackageLoadingTests/PDLoadingTests.swift +++ b/Tests/PackageLoadingTests/PDLoadingTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,8 +16,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - class PackageDescriptionLoadingTests: XCTestCase, ManifestLoaderDelegate { lazy var manifestLoader = ManifestLoader(toolchain: try! UserToolchain.default, delegate: self) var parsedManifest = ThreadSafeBox() diff --git a/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift b/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift index 3fbc4136141..b3a50c22c7c 100644 --- a/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2017-2020 Apple Inc. and the Swift project authors +// Copyright (c) 2017-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,8 +16,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - final class PackageDescription4_0LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { .v4 diff --git a/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift b/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift index a2e325a6de2..801a92bf543 100644 --- a/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -17,7 +17,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem import enum TSCBasic.PathValidationError import struct TSCUtility.Version diff --git a/Tests/PackageLoadingTests/PackageBuilderTests.swift b/Tests/PackageLoadingTests/PackageBuilderTests.swift index 373ce9de4b7..09ee0401d70 100644 --- a/Tests/PackageLoadingTests/PackageBuilderTests.swift +++ b/Tests/PackageLoadingTests/PackageBuilderTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,8 +16,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - /// Tests for the handling of source layout conventions. final class PackageBuilderTests: XCTestCase { func testDotFilesAreIgnored() throws { diff --git a/Tests/PackageLoadingTests/PkgConfigParserTests.swift b/Tests/PackageLoadingTests/PkgConfigParserTests.swift index 20f5889c2ce..6909582759f 100644 --- a/Tests/PackageLoadingTests/PkgConfigParserTests.swift +++ b/Tests/PackageLoadingTests/PkgConfigParserTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,7 +16,6 @@ import _InternalTestSupport import XCTest import struct TSCBasic.ByteString -import class TSCBasic.InMemoryFileSystem final class PkgConfigParserTests: XCTestCase { func testCircularPCFile() throws { diff --git a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift index f37150fd1fa..b8ac83dabd0 100644 --- a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift +++ b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2019 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -17,9 +17,7 @@ import PackageLoading import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - -class TargetSourcesBuilderTests: XCTestCase { +final class TargetSourcesBuilderTests: XCTestCase { func testBasicFileContentsComputation() throws { let target = try TargetDescription( name: "Foo", diff --git a/Tests/PackageLoadingTests/ToolsVersionParserTests.swift b/Tests/PackageLoadingTests/ToolsVersionParserTests.swift index 75673959986..c7c6b05778d 100644 --- a/Tests/PackageLoadingTests/ToolsVersionParserTests.swift +++ b/Tests/PackageLoadingTests/ToolsVersionParserTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -10,16 +10,13 @@ // //===----------------------------------------------------------------------===// - import Basics import PackageModel import PackageLoading import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - -class ToolsVersionParserTests: XCTestCase { +final class ToolsVersionParserTests: XCTestCase { func parse(_ content: String, _ body: ((ToolsVersion) -> Void)? = nil) throws { let toolsVersion = try ToolsVersionParser.parse(utf8String: content) body?(toolsVersion) diff --git a/Tests/PackageModelTests/SwiftSDKBundleTests.swift b/Tests/PackageModelTests/SwiftSDKBundleTests.swift index 34a5760316c..1dd9ed4c2ab 100644 --- a/Tests/PackageModelTests/SwiftSDKBundleTests.swift +++ b/Tests/PackageModelTests/SwiftSDKBundleTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2023 Apple Inc. and the Swift project authors +// Copyright (c) 2023-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -18,7 +18,6 @@ import XCTest import struct TSCBasic.ByteString import protocol TSCBasic.FileSystem -import class TSCBasic.InMemoryFileSystem private let testArtifactID = "test-artifact" diff --git a/Tests/PackageModelTests/SwiftSDKTests.swift b/Tests/PackageModelTests/SwiftSDKTests.swift index 1ddcd9c6f50..5cd15f0bb4d 100644 --- a/Tests/PackageModelTests/SwiftSDKTests.swift +++ b/Tests/PackageModelTests/SwiftSDKTests.swift @@ -18,8 +18,6 @@ @testable import SPMBuildCore import XCTest -import class TSCBasic.InMemoryFileSystem - private let bundleRootPath = try! AbsolutePath(validating: "/tmp/cross-toolchain") private let toolchainBinDir = RelativePath("swift.xctoolchain/usr/bin") private let sdkRootDir = RelativePath("ubuntu-jammy.sdk") diff --git a/Tests/PackageModelTests/ToolsetTests.swift b/Tests/PackageModelTests/ToolsetTests.swift index 7a8ca26f484..3cc877cd473 100644 --- a/Tests/PackageModelTests/ToolsetTests.swift +++ b/Tests/PackageModelTests/ToolsetTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2023 Apple Inc. and the Swift project authors +// Copyright (c) 2023-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,8 +15,6 @@ import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - private let usrBinTools = Dictionary(uniqueKeysWithValues: Toolset.KnownTool.allCases.map { ($0, try! AbsolutePath(validating: "/usr/bin/\($0.rawValue)")) }) diff --git a/Tests/PackageRegistryTests/RegistryClientTests.swift b/Tests/PackageRegistryTests/RegistryClientTests.swift index 11387351123..9262e4fedca 100644 --- a/Tests/PackageRegistryTests/RegistryClientTests.swift +++ b/Tests/PackageRegistryTests/RegistryClientTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -21,8 +21,6 @@ import _InternalTestSupport import XCTest import protocol TSCBasic.HashAlgorithm -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version final class RegistryClientTests: XCTestCase { diff --git a/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift b/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift index fab603ab453..c974dbdb755 100644 --- a/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift +++ b/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2022-2023 Apple Inc. and the Swift project authors +// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -17,11 +17,9 @@ import PackageLoading import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version -class RegistryDownloadsManagerTests: XCTestCase { +final class RegistryDownloadsManagerTests: XCTestCase { func testNoCache() async throws { let observability = ObservabilitySystem.makeForTesting() let fs = InMemoryFileSystem() diff --git a/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift b/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift index e67fd403852..836c71ce008 100644 --- a/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift +++ b/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2023 Apple Inc. and the Swift project authors +// Copyright (c) 2023-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -18,8 +18,6 @@ import PackageModel import _InternalTestSupport import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version final class FilePackageSigningEntityStorageTests: XCTestCase { diff --git a/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift b/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift index 14aab8c68ea..0221a8cfc2f 100644 --- a/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift +++ b/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2021 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -14,8 +14,6 @@ import Basics import PackageModel import XCTest -import class TSCBasic.InMemoryFileSystem - final class ArtifactsArchiveMetadataTests: XCTestCase { func testParseMetadata() throws { let fileSystem = InMemoryFileSystem() diff --git a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift index f6f5b5c42ea..f52cf14a493 100644 --- a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift +++ b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift @@ -25,8 +25,6 @@ import _InternalTestSupport import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.SerializedDiagnostics final class PluginInvocationTests: XCTestCase { diff --git a/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift b/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift index 1aa7f427d0e..dca0f7c81ac 100644 --- a/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift +++ b/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -10,11 +10,10 @@ // //===----------------------------------------------------------------------===// +import class Basics.InMemoryFileSystem import SPMBuildCore import XCTest -import class TSCBasic.InMemoryFileSystem - final class XCFrameworkMetadataTests: XCTestCase { func testParseFramework() throws { let fileSystem = InMemoryFileSystem(files: [ diff --git a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift index f9245502f52..d2ab60b6b80 100644 --- a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift +++ b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,7 +15,7 @@ import SourceControl import _InternalTestSupport import XCTest -class InMemoryGitRepositoryTests: XCTestCase { +final class InMemoryGitRepositoryTests: XCTestCase { func testBasics() throws { let fs = InMemoryFileSystem() let repo = InMemoryGitRepository(path: .root, fs: fs) diff --git a/Tests/SourceControlTests/RepositoryManagerTests.swift b/Tests/SourceControlTests/RepositoryManagerTests.swift index 00381fd9367..6c48f4994c3 100644 --- a/Tests/SourceControlTests/RepositoryManagerTests.swift +++ b/Tests/SourceControlTests/RepositoryManagerTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -16,9 +16,7 @@ import _InternalTestSupport @testable import SourceControl import XCTest -import class TSCBasic.InMemoryFileSystem - -class RepositoryManagerTests: XCTestCase { +final class RepositoryManagerTests: XCTestCase { func testBasics() async throws { let fs = localFileSystem let observability = ObservabilitySystem.makeForTesting() diff --git a/Tests/WorkspaceTests/AuthorizationProviderTests.swift b/Tests/WorkspaceTests/AuthorizationProviderTests.swift index 8ac34aabab3..4e8bebabed2 100644 --- a/Tests/WorkspaceTests/AuthorizationProviderTests.swift +++ b/Tests/WorkspaceTests/AuthorizationProviderTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2020-2022 Apple Inc. and the Swift project authors +// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,8 +15,6 @@ import _InternalTestSupport import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - final class AuthorizationProviderTests: XCTestCase { func testNetrcAuthorizationProviders() throws { let observability = ObservabilitySystem.makeForTesting() diff --git a/Tests/WorkspaceTests/MirrorsConfigurationTests.swift b/Tests/WorkspaceTests/MirrorsConfigurationTests.swift index ff94bbc4ee1..d91861303c1 100644 --- a/Tests/WorkspaceTests/MirrorsConfigurationTests.swift +++ b/Tests/WorkspaceTests/MirrorsConfigurationTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2020 Apple Inc. and the Swift project authors +// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -15,8 +15,6 @@ import _InternalTestSupport import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - final class MirrorsConfigurationTests: XCTestCase { func testLoadingSchema1() throws { let fs = InMemoryFileSystem() diff --git a/Tests/WorkspaceTests/PinsStoreTests.swift b/Tests/WorkspaceTests/PinsStoreTests.swift index 3dedbcf82e1..ed6df0b9fff 100644 --- a/Tests/WorkspaceTests/PinsStoreTests.swift +++ b/Tests/WorkspaceTests/PinsStoreTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2017 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -18,8 +18,6 @@ import SourceControl import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - import struct TSCUtility.Version final class PinsStoreTests: XCTestCase { diff --git a/Tests/WorkspaceTests/ToolsVersionSpecificationRewriterTests.swift b/Tests/WorkspaceTests/ToolsVersionSpecificationRewriterTests.swift index b3265ae2add..486951cbb26 100644 --- a/Tests/WorkspaceTests/ToolsVersionSpecificationRewriterTests.swift +++ b/Tests/WorkspaceTests/ToolsVersionSpecificationRewriterTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2020 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -19,10 +19,8 @@ import PackageModel @testable import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - /// Test cases for `rewriteToolsVersionSpecification(toDefaultManifestIn:specifying:fileSystem:)` -class ToolsVersionSpecificationRewriterTests: XCTestCase { +final class ToolsVersionSpecificationRewriterTests: XCTestCase { /// Tests `rewriteToolsVersionSpecification(toDefaultManifestIn:specifying:fileSystem:)`. func testNonVersionSpecificManifests() throws { diff --git a/Tests/WorkspaceTests/WorkspaceStateTests.swift b/Tests/WorkspaceTests/WorkspaceStateTests.swift index a0d6ca66370..bee32b97ed6 100644 --- a/Tests/WorkspaceTests/WorkspaceStateTests.swift +++ b/Tests/WorkspaceTests/WorkspaceStateTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2021 Apple Inc. and the Swift project authors +// Copyright (c) 2021-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -14,8 +14,6 @@ import Basics @testable import Workspace import XCTest -import class TSCBasic.InMemoryFileSystem - final class WorkspaceStateTests: XCTestCase { func testV4Format() throws { let fs = InMemoryFileSystem() diff --git a/Tests/XCBuildSupportTests/PIFBuilderTests.swift b/Tests/XCBuildSupportTests/PIFBuilderTests.swift index 29216e8ac7c..876ca536d10 100644 --- a/Tests/XCBuildSupportTests/PIFBuilderTests.swift +++ b/Tests/XCBuildSupportTests/PIFBuilderTests.swift @@ -2,7 +2,7 @@ // // This source file is part of the Swift open source project // -// Copyright (c) 2014-2020 Apple Inc. and the Swift project authors +// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors // Licensed under Apache License v2.0 with Runtime Library Exception // // See http://swift.org/LICENSE.txt for license information @@ -23,9 +23,7 @@ import _InternalTestSupport @testable import XCBuildSupport import XCTest -import class TSCBasic.InMemoryFileSystem - -class PIFBuilderTests: XCTestCase { +final class PIFBuilderTests: XCTestCase { let inputsDir = AbsolutePath(#file).parentDirectory.appending(components: "Inputs") func testOrdering() throws {