diff --git a/CMakeLists.txt b/CMakeLists.txt index db4c32af6a7..38a41305ac7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ string(COMPARE EQUAL ${CMAKE_SYSTEM_NAME} Windows CMAKE_INSTALL_DEFAULT) option(USE_CMAKE_INSTALL "Install build products using cmake's install() instead of the bootstrap script's install()" ${CMAKE_INSTALL_DEFAULT}) - + if(BUILD_SHARED_LIBS) set(CMAKE_POSITION_INDEPENDENT_CODE YES) endif() @@ -53,6 +53,7 @@ if(FIND_PM_DEPS) find_package(ArgumentParser CONFIG REQUIRED) find_package(SwiftCrypto CONFIG REQUIRED) find_package(SwiftDriver CONFIG REQUIRED) + find_package(SwiftCollections CONFIG REQUIRED) endif() find_package(dispatch QUIET) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0523897f545..b88ae027944 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -164,6 +164,13 @@ For example, if the latest tag is 1.1.3: $> git clone https://github.com/apple/swift-crypto --branch 1.1.3 ``` +5. Clone [swift-collections](https://github.com/apple/swift-collections) beside the SwiftPM directory and check out tag with the [latest version](https://github.com/apple/swift-collections/tags). + +For example, if the latest tag is 0.0.3: +```bash +$> git clone https://github.com/apple/swift-collections --branch 0.0.3 +``` + #### Building ```bash @@ -374,4 +381,3 @@ $> swift package update ``` Alternatively, if you are using Xcode, you can update to the latest version of all packages: **Xcode App** > *File* > *Swift Packages* > *Update to Latest Package Versions* - diff --git a/Package.swift b/Package.swift index 3746404c47b..22b928f9b66 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ import class Foundation.ProcessInfo /** SwiftPMDataModel is the subset of SwiftPM product that includes just its data model. -This allowis some clients (such as IDEs) that use SwiftPM's data model but not its build system +This allows some clients (such as IDEs) that use SwiftPM's data model but not its build system to not have to depend on SwiftDriver, SwiftLLBuild, etc. We should probably have better names here, though that could break some clients. */ @@ -33,7 +33,7 @@ let swiftPMDataModelProduct = ( ] ) -/** The `libSwiftPM` set of interfaces to programatically work with Swift +/** The `libSwiftPM` set of interfaces to programmatically work with Swift packages. `libSwiftPM` includes all of the SwiftPM code except the command line tools, while `libSwiftPMDataModel` includes only the data model. @@ -126,7 +126,10 @@ let package = Package( .target( name: "Basics", - dependencies: ["SwiftToolsSupport-auto"]), + dependencies: [ + "SwiftToolsSupport-auto", + .product(name: "OrderedCollections", package: "swift-collections") + ]), .target( /** The llbuild manifest model */ @@ -356,6 +359,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.4.3")), .package(url: "https://github.com/apple/swift-driver.git", .branch(relatedDependenciesBranch)), .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "1.1.4")), + .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "0.0.3")), ] } else { package.dependencies += [ @@ -363,5 +367,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { .package(path: "../swift-argument-parser"), .package(path: "../swift-driver"), .package(path: "../swift-crypto"), + .package(path: "../swift-collections"), ] } diff --git a/Sources/Basics/ByteString+Extensions.swift b/Sources/Basics/ByteString+Extensions.swift index 99f69c773cd..894ed452831 100644 --- a/Sources/Basics/ByteString+Extensions.swift +++ b/Sources/Basics/ByteString+Extensions.swift @@ -6,8 +6,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - extension ByteString { /// A lowercase, hexadecimal representation of the SHA256 hash /// generated for the byte string's contents. diff --git a/Sources/Basics/CMakeLists.txt b/Sources/Basics/CMakeLists.txt index 85a70163ef4..d2a90480c01 100644 --- a/Sources/Basics/CMakeLists.txt +++ b/Sources/Basics/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(Basics Dictionary+Extensions.swift DispatchTimeInterval+Extensions.swift Errors.swift + Exports.swift FileSystem+Extensions.swift HTPClient+URLSession.swift HTTPClient.swift diff --git a/Sources/Basics/ConcurrencyHelpers.swift b/Sources/Basics/ConcurrencyHelpers.swift index cd446d8d007..fdfcb18dca4 100644 --- a/Sources/Basics/ConcurrencyHelpers.swift +++ b/Sources/Basics/ConcurrencyHelpers.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ + import Dispatch import class Foundation.ProcessInfo -import TSCBasic /// Thread-safe dictionary like structure public final class ThreadSafeKeyValueStore where Key: Hashable { diff --git a/Sources/Basics/Dictionary+Extensions.swift b/Sources/Basics/Dictionary+Extensions.swift index 821419a8350..cf03835d972 100644 --- a/Sources/Basics/Dictionary+Extensions.swift +++ b/Sources/Basics/Dictionary+Extensions.swift @@ -6,8 +6,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - extension Dictionary { @inlinable @discardableResult diff --git a/Sources/Basics/Exports.swift b/Sources/Basics/Exports.swift new file mode 100644 index 00000000000..2e0f976f023 --- /dev/null +++ b/Sources/Basics/Exports.swift @@ -0,0 +1,16 @@ +/* + This source file is part of the Swift.org open source project + + Copyright (c) 2021 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 + See http://swift.org/CONTRIBUTORS.txt for Swift project authors + */ + +@_exported import OrderedCollections +@_exported import TSCBasic +// override TSC versions until deprecated +// TODO: remove once TSC removes these +public typealias OrderedSet = OrderedCollections.OrderedSet +public typealias OrderedDictionary = OrderedCollections.OrderedDictionary diff --git a/Sources/Basics/FileSystem+Extensions.swift b/Sources/Basics/FileSystem+Extensions.swift index 2d306539e07..f57ce10ddce 100644 --- a/Sources/Basics/FileSystem+Extensions.swift +++ b/Sources/Basics/FileSystem+Extensions.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import class Foundation.FileManager // MARK: - user level diff --git a/Sources/Basics/HTPClient+URLSession.swift b/Sources/Basics/HTPClient+URLSession.swift index 6de599d390c..048b4bf4074 100644 --- a/Sources/Basics/HTPClient+URLSession.swift +++ b/Sources/Basics/HTPClient+URLSession.swift @@ -9,7 +9,6 @@ */ import Foundation -import TSCBasic import struct TSCUtility.Versioning #if canImport(FoundationNetworking) // FIXME: this brings OpenSSL dependency on Linux diff --git a/Sources/Basics/HTTPClient.swift b/Sources/Basics/HTTPClient.swift index b7cb75fde1e..84e5516f923 100644 --- a/Sources/Basics/HTTPClient.swift +++ b/Sources/Basics/HTTPClient.swift @@ -14,7 +14,6 @@ import struct Foundation.Date import class Foundation.JSONDecoder import class Foundation.NSError import struct Foundation.URL -import TSCBasic import TSCUtility #if canImport(Glibc) diff --git a/Sources/Basics/SQLiteBackedCache.swift b/Sources/Basics/SQLiteBackedCache.swift index 53d0b579a55..8ee808a6bf6 100644 --- a/Sources/Basics/SQLiteBackedCache.swift +++ b/Sources/Basics/SQLiteBackedCache.swift @@ -9,8 +9,6 @@ */ import Foundation - -import TSCBasic import TSCUtility /// SQLite backed persistent cache. diff --git a/Sources/Basics/Sandbox.swift b/Sources/Basics/Sandbox.swift index 761f4a2d63f..7801741469d 100644 --- a/Sources/Basics/Sandbox.swift +++ b/Sources/Basics/Sandbox.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import TSCUtility public enum Sandbox { diff --git a/Sources/Build/BuildOperation.swift b/Sources/Build/BuildOperation.swift index c17262fd50f..24f3b1c7145 100644 --- a/Sources/Build/BuildOperation.swift +++ b/Sources/Build/BuildOperation.swift @@ -14,7 +14,6 @@ import PackageGraph import PackageModel import SPMBuildCore import SPMLLBuild -import TSCBasic import TSCUtility public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider { diff --git a/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift b/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift index ed801adf3d3..aadc6971fdd 100644 --- a/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift +++ b/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift @@ -9,14 +9,13 @@ */ import Basics -import TSCBasic -import TSCUtility -import SPMLLBuild -import PackageModel import Dispatch import Foundation import LLBuildManifest +import PackageModel import SPMBuildCore +import SPMLLBuild +import TSCUtility #if canImport(llbuildSwift) typealias LLBuildBuildSystemDelegate = llbuildSwift.BuildSystemDelegate diff --git a/Sources/Build/BuildPlan.swift b/Sources/Build/BuildPlan.swift index 78072f5b17d..0c878077b4d 100644 --- a/Sources/Build/BuildPlan.swift +++ b/Sources/Build/BuildPlan.swift @@ -9,14 +9,13 @@ */ import Basics -import TSCBasic -import TSCUtility -import PackageModel +import Foundation import PackageGraph import PackageLoading -import Foundation +import PackageModel import SPMBuildCore @_implementationOnly import SwiftDriver +import TSCUtility extension String { fileprivate var asSwiftStringLiteralConstant: String { diff --git a/Sources/Build/ManifestBuilder.swift b/Sources/Build/ManifestBuilder.swift index 5edef27b262..d24cd44da41 100644 --- a/Sources/Build/ManifestBuilder.swift +++ b/Sources/Build/ManifestBuilder.swift @@ -8,17 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import LLBuildManifest - import Basics -import TSCBasic -import TSCUtility - +import LLBuildManifest import PackageModel import PackageGraph import SPMBuildCore - @_implementationOnly import SwiftDriver +import TSCUtility public class LLBuildManifestBuilder { public enum TargetKind { diff --git a/Sources/Build/SPMSwiftDriverExecutor.swift b/Sources/Build/SPMSwiftDriverExecutor.swift index 1c9ba274062..34c017c509b 100644 --- a/Sources/Build/SPMSwiftDriverExecutor.swift +++ b/Sources/Build/SPMSwiftDriverExecutor.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import Foundation @_implementationOnly import SwiftDriver diff --git a/Sources/Build/SwiftCompilerOutputParser.swift b/Sources/Build/SwiftCompilerOutputParser.swift index 1c4da707b15..371f5416e2c 100644 --- a/Sources/Build/SwiftCompilerOutputParser.swift +++ b/Sources/Build/SwiftCompilerOutputParser.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation -import TSCBasic import TSCUtility /// Represents a message output by the Swift compiler in JSON output mode. diff --git a/Sources/Commands/APIDigester.swift b/Sources/Commands/APIDigester.swift index cb76d643fe7..714246bc22c 100644 --- a/Sources/Commands/APIDigester.swift +++ b/Sources/Commands/APIDigester.swift @@ -8,17 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Dispatch - -import TSCBasic -import TSCUtility - -import SPMBuildCore import Basics import Build +import Dispatch import PackageGraph import PackageModel import SourceControl +import SPMBuildCore import Workspace /// Helper for emitting a JSON API baseline for a module. diff --git a/Sources/Commands/Describe.swift b/Sources/Commands/Describe.swift index 0b1c69c4ed0..eb4b8828078 100644 --- a/Sources/Commands/Describe.swift +++ b/Sources/Commands/Describe.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import PackageModel +import Basics import Foundation - +import PackageModel enum DescribeMode: String { /// JSON format (guaranteed to be parsable and stable across time). diff --git a/Sources/Commands/Error.swift b/Sources/Commands/Error.swift index 14af126d0a8..186e927b844 100644 --- a/Sources/Commands/Error.swift +++ b/Sources/Commands/Error.swift @@ -8,12 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageLoading import PackageModel import SourceControl -import TSCUtility import func TSCLibc.exit +import TSCUtility import Workspace enum Error: Swift.Error { diff --git a/Sources/Commands/GenerateLinuxMain.swift b/Sources/Commands/GenerateLinuxMain.swift index 1ce489628b9..252743df71c 100644 --- a/Sources/Commands/GenerateLinuxMain.swift +++ b/Sources/Commands/GenerateLinuxMain.swift @@ -11,7 +11,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors import Basics import PackageGraph import PackageModel -import TSCBasic /// A utility for generating test entries on linux. /// diff --git a/Sources/Commands/MultiRootSupport.swift b/Sources/Commands/MultiRootSupport.swift index c74d01c6269..d001a69c859 100644 --- a/Sources/Commands/MultiRootSupport.swift +++ b/Sources/Commands/MultiRootSupport.swift @@ -8,14 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import TSCUtility -import class PackageModel.Manifest +import Basics import Foundation - #if canImport(FoundationXML) import FoundationXML #endif +import class PackageModel.Manifest +import TSCUtility /// A bare minimum loader for Xcode workspaces. /// diff --git a/Sources/Commands/Options.swift b/Sources/Commands/Options.swift index 6c77a0ac409..6d50694c75f 100644 --- a/Sources/Commands/Options.swift +++ b/Sources/Commands/Options.swift @@ -9,11 +9,11 @@ */ import ArgumentParser -import TSCBasic -import TSCUtility +import Basics +import Build import PackageModel import SPMBuildCore -import Build +import TSCUtility struct BuildFlagsGroup: ParsableArguments { @Option(name: .customLong("Xcc", withSingleDash: true), diff --git a/Sources/Commands/SwiftBuildTool.swift b/Sources/Commands/SwiftBuildTool.swift index 5200bfd08e4..7de7d52d036 100644 --- a/Sources/Commands/SwiftBuildTool.swift +++ b/Sources/Commands/SwiftBuildTool.swift @@ -13,7 +13,6 @@ import Basics import Build import PackageGraph import SPMBuildCore -import TSCBasic import TSCUtility extension BuildSubset { diff --git a/Sources/Commands/SwiftPackageCollectionsTool.swift b/Sources/Commands/SwiftPackageCollectionsTool.swift index 58272d8431b..fdcef912be6 100644 --- a/Sources/Commands/SwiftPackageCollectionsTool.swift +++ b/Sources/Commands/SwiftPackageCollectionsTool.swift @@ -13,7 +13,6 @@ import Basics import Foundation import PackageCollections import PackageModel -import TSCBasic import TSCUtility private enum CollectionsError: Swift.Error { diff --git a/Sources/Commands/SwiftPackageTool.swift b/Sources/Commands/SwiftPackageTool.swift index 3981baf38fe..7343fa1b5f6 100644 --- a/Sources/Commands/SwiftPackageTool.swift +++ b/Sources/Commands/SwiftPackageTool.swift @@ -10,18 +10,17 @@ import ArgumentParser import Basics -import TSCBasic -import SPMBuildCore import Build -import PackageModel -import PackageLoading +import Foundation import PackageGraph +import PackageLoading +import PackageModel import SourceControl +import SPMBuildCore import TSCUtility +import Workspace import Xcodeproj import XCBuildSupport -import Workspace -import Foundation /// swift-package tool namespace public struct SwiftPackageTool: ParsableCommand { diff --git a/Sources/Commands/SwiftRunTool.swift b/Sources/Commands/SwiftRunTool.swift index 201d86b6408..669e2ae762c 100644 --- a/Sources/Commands/SwiftRunTool.swift +++ b/Sources/Commands/SwiftRunTool.swift @@ -13,7 +13,6 @@ import Basics import Build import PackageGraph import PackageModel -import TSCBasic import TSCUtility /// An enumeration of the errors that can be generated by the run tool. diff --git a/Sources/Commands/SwiftTestTool.swift b/Sources/Commands/SwiftTestTool.swift index f9e3b8bdefd..b34e4e47408 100644 --- a/Sources/Commands/SwiftTestTool.swift +++ b/Sources/Commands/SwiftTestTool.swift @@ -12,13 +12,11 @@ import class Foundation.ProcessInfo import ArgumentParser import Basics -import TSCBasic -import SPMBuildCore import Build -import TSCUtility import PackageGraph +import SPMBuildCore +import TSCUtility import Workspace - import func TSCLibc.exit private enum TestError: Swift.Error { diff --git a/Sources/Commands/SwiftTool.swift b/Sources/Commands/SwiftTool.swift index 6eae2db5805..6608f5d3970 100644 --- a/Sources/Commands/SwiftTool.swift +++ b/Sources/Commands/SwiftTool.swift @@ -8,24 +8,22 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ + +import ArgumentParser +import Basics +import Build +import Dispatch import func Foundation.NSUserName import class Foundation.ProcessInfo import func Foundation.NSHomeDirectory -import Dispatch - -import ArgumentParser -import TSCLibc -import TSCBasic -import TSCUtility - -import PackageModel import PackageGraph +import PackageModel import SourceControl import SPMBuildCore -import Build -import XCBuildSupport +import TSCLibc +import TSCUtility import Workspace -import Basics +import XCBuildSupport typealias Diagnostic = TSCBasic.Diagnostic diff --git a/Sources/Commands/SymbolGraphExtract.swift b/Sources/Commands/SymbolGraphExtract.swift index 2dfba9e60a3..5677223df2b 100644 --- a/Sources/Commands/SymbolGraphExtract.swift +++ b/Sources/Commands/SymbolGraphExtract.swift @@ -8,16 +8,14 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation - -import TSCBasic -import TSCUtility - -import SPMBuildCore +import Basics import Build +import Foundation import PackageGraph import PackageModel import SourceControl +import SPMBuildCore +import TSCUtility import Workspace /// A wrapper for swift-symbolgraph-extract tool. diff --git a/Sources/Commands/WatchmanHelper.swift b/Sources/Commands/WatchmanHelper.swift index be4f129f237..59062969127 100644 --- a/Sources/Commands/WatchmanHelper.swift +++ b/Sources/Commands/WatchmanHelper.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility import Xcodeproj diff --git a/Sources/Commands/show-dependencies.swift b/Sources/Commands/show-dependencies.swift index 99ef7520224..14116bda136 100644 --- a/Sources/Commands/show-dependencies.swift +++ b/Sources/Commands/show-dependencies.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel import PackageGraph diff --git a/Sources/LLBuildManifest/DOTManifestSerializer.swift b/Sources/LLBuildManifest/DOTManifestSerializer.swift index 21d7bf8f250..5251934e2ce 100644 --- a/Sources/LLBuildManifest/DOTManifestSerializer.swift +++ b/Sources/LLBuildManifest/DOTManifestSerializer.swift @@ -8,8 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - /// Serializes an LLBuildManifest graph to a .dot file public struct DOTManifestSerializer { var kindCounter = [String: Int]() diff --git a/Sources/LLBuildManifest/ManifestWriter.swift b/Sources/LLBuildManifest/ManifestWriter.swift index 88d906f818a..344f5ca7737 100644 --- a/Sources/LLBuildManifest/ManifestWriter.swift +++ b/Sources/LLBuildManifest/ManifestWriter.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics public struct ManifestWriter { diff --git a/Sources/LLBuildManifest/Node.swift b/Sources/LLBuildManifest/Node.swift index 9754268d377..e10b7f9d1a5 100644 --- a/Sources/LLBuildManifest/Node.swift +++ b/Sources/LLBuildManifest/Node.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics public struct Node: Hashable, Codable { public enum Kind: String, Hashable, Codable { diff --git a/Sources/LLBuildManifest/Tools.swift b/Sources/LLBuildManifest/Tools.swift index 35b11ce3ac3..5e36037509f 100644 --- a/Sources/LLBuildManifest/Tools.swift +++ b/Sources/LLBuildManifest/Tools.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import class Foundation.ProcessInfo -import TSCBasic public protocol ToolProtocol: Codable { /// The name of the tool. diff --git a/Sources/PackageCollections/Model/Collection.swift b/Sources/PackageCollections/Model/Collection.swift index f9d5b6f3c0e..4b80b64b95f 100644 --- a/Sources/PackageCollections/Model/Collection.swift +++ b/Sources/PackageCollections/Model/Collection.swift @@ -8,12 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import struct Foundation.Date import struct Foundation.URL - import PackageModel import SourceControl -import TSCBasic import TSCUtility public enum PackageCollectionsModel {} diff --git a/Sources/PackageCollections/PackageCollections+CertificatePolicy.swift b/Sources/PackageCollections/PackageCollections+CertificatePolicy.swift index cccfbf46235..ee2b7c581cc 100644 --- a/Sources/PackageCollections/PackageCollections+CertificatePolicy.swift +++ b/Sources/PackageCollections/PackageCollections+CertificatePolicy.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import struct Foundation.URL - import PackageCollectionsSigning -import TSCBasic /// Configuration in this file is intended for package collection sources to define certificate policies /// that are more restrictive. For example, a source may want to require that all their package diff --git a/Sources/PackageCollections/PackageCollections+Storage.swift b/Sources/PackageCollections/PackageCollections+Storage.swift index b1fa5debcc7..125e1eaa7e7 100644 --- a/Sources/PackageCollections/PackageCollections+Storage.swift +++ b/Sources/PackageCollections/PackageCollections+Storage.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics extension PackageCollections { struct Storage: Closable { diff --git a/Sources/PackageCollections/PackageCollections+Validation.swift b/Sources/PackageCollections/PackageCollections+Validation.swift index 575eeb4ac5e..491537563a3 100644 --- a/Sources/PackageCollections/PackageCollections+Validation.swift +++ b/Sources/PackageCollections/PackageCollections+Validation.swift @@ -8,8 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - import Basics import PackageCollectionsModel import PackageModel diff --git a/Sources/PackageCollections/PackageCollections.swift b/Sources/PackageCollections/PackageCollections.swift index a46574436a2..c41eba45409 100644 --- a/Sources/PackageCollections/PackageCollections.swift +++ b/Sources/PackageCollections/PackageCollections.swift @@ -10,7 +10,6 @@ import Basics import PackageModel -import TSCBasic // TODO: is there a better name? this conflicts with the module name which is okay in this case but not ideal in Swift public struct PackageCollections: PackageCollectionsProtocol { diff --git a/Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift b/Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift index 96caa08ca71..3f337a31b07 100644 --- a/Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift +++ b/Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift @@ -16,7 +16,6 @@ import struct Foundation.NSRange import class Foundation.NSRegularExpression import struct Foundation.URL import PackageModel -import TSCBasic struct GitHubPackageMetadataProvider: PackageMetadataProvider { private static let apiHostPrefix = "api." diff --git a/Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift b/Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift index 4728226ac5b..28eec94df7c 100644 --- a/Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift +++ b/Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift @@ -15,12 +15,10 @@ import struct Foundation.Date import class Foundation.JSONDecoder import class Foundation.ProcessInfo import struct Foundation.URL - import PackageCollectionsModel import PackageCollectionsSigning import PackageModel import SourceControl -import TSCBasic private typealias JSONModel = PackageCollectionModel.V1 diff --git a/Sources/PackageCollections/Providers/PackageMetadataProvider.swift b/Sources/PackageCollections/Providers/PackageMetadataProvider.swift index fe68ee4453e..e94f5bdfd81 100644 --- a/Sources/PackageCollections/Providers/PackageMetadataProvider.swift +++ b/Sources/PackageCollections/Providers/PackageMetadataProvider.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import struct Foundation.Date import struct Foundation.URL - import PackageModel -import TSCBasic import TSCUtility /// `PackageBasicMetadata` provider diff --git a/Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift b/Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift index 66658427bbe..92f924b6e5d 100644 --- a/Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift +++ b/Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift @@ -14,7 +14,6 @@ import struct Foundation.Data import class Foundation.JSONDecoder import class Foundation.JSONEncoder import struct Foundation.URL -import TSCBasic struct FilePackageCollectionsSourcesStorage: PackageCollectionsSourcesStorage { let fileSystem: FileSystem diff --git a/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift b/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift index 42caa78850d..d95ce64bd0a 100644 --- a/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift +++ b/Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift @@ -15,7 +15,6 @@ import class Foundation.JSONDecoder import class Foundation.JSONEncoder import struct Foundation.URL import PackageModel -import TSCBasic import TSCUtility final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable { diff --git a/Sources/PackageCollections/Storage/Trie.swift b/Sources/PackageCollections/Storage/Trie.swift index ca150af2bfa..a8b1e13797a 100644 --- a/Sources/PackageCollections/Storage/Trie.swift +++ b/Sources/PackageCollections/Storage/Trie.swift @@ -8,8 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - +import Basics import PackageModel struct Trie { diff --git a/Sources/PackageCollectionsSigning/Certificate/CertificatePolicy.swift b/Sources/PackageCollectionsSigning/Certificate/CertificatePolicy.swift index f6d9033744d..199191cb16e 100644 --- a/Sources/PackageCollectionsSigning/Certificate/CertificatePolicy.swift +++ b/Sources/PackageCollectionsSigning/Certificate/CertificatePolicy.swift @@ -8,15 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Dispatch import struct Foundation.Data import struct Foundation.Date import class Foundation.FileManager import struct Foundation.URL - -import Basics -import TSCBasic - #if os(macOS) import Security #elseif os(Linux) || os(Windows) || os(Android) diff --git a/Sources/PackageCollectionsSigning/PackageCollectionSigning.swift b/Sources/PackageCollectionsSigning/PackageCollectionSigning.swift index fd6c8d61a34..61ec77886f0 100644 --- a/Sources/PackageCollectionsSigning/PackageCollectionSigning.swift +++ b/Sources/PackageCollectionsSigning/PackageCollectionSigning.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Dispatch import Foundation - -import Basics import PackageCollectionsModel -import TSCBasic public protocol PackageCollectionSigner { /// Signs package collection using the given certificate and key. diff --git a/Sources/PackageGraph/CheckoutState.swift b/Sources/PackageGraph/CheckoutState.swift index 079516a4b72..ed048dcdbd2 100644 --- a/Sources/PackageGraph/CheckoutState.swift +++ b/Sources/PackageGraph/CheckoutState.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import SourceControl import TSCUtility diff --git a/Sources/PackageGraph/DependencyMirrors.swift b/Sources/PackageGraph/DependencyMirrors.swift index 716e857129e..4c7fcee7307 100644 --- a/Sources/PackageGraph/DependencyMirrors.swift +++ b/Sources/PackageGraph/DependencyMirrors.swift @@ -8,9 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation - -import TSCBasic import TSCUtility /// A collection of dependency mirrors. diff --git a/Sources/PackageGraph/DependencyResolutionNode.swift b/Sources/PackageGraph/DependencyResolutionNode.swift index 70ec821f8f9..e1fac4ee7a2 100644 --- a/Sources/PackageGraph/DependencyResolutionNode.swift +++ b/Sources/PackageGraph/DependencyResolutionNode.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageModel import struct TSCUtility.Version diff --git a/Sources/PackageGraph/DependencyResolver.swift b/Sources/PackageGraph/DependencyResolver.swift index 18d934925b6..9db5e3f9d1b 100644 --- a/Sources/PackageGraph/DependencyResolver.swift +++ b/Sources/PackageGraph/DependencyResolver.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Dispatch import PackageModel -import TSCBasic public protocol DependencyResolver { typealias Binding = (package: PackageReference, binding: BoundVersion, products: ProductFilter) diff --git a/Sources/PackageGraph/Diagnostics.swift b/Sources/PackageGraph/Diagnostics.swift index 8e2b82dc109..f567963ec71 100644 --- a/Sources/PackageGraph/Diagnostics.swift +++ b/Sources/PackageGraph/Diagnostics.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics extension Diagnostic.Message { static func unusedDependency(_ name: String) -> Diagnostic.Message { diff --git a/Sources/PackageGraph/GraphLoadingNode.swift b/Sources/PackageGraph/GraphLoadingNode.swift index 2f4a495041e..0b2dee299a7 100644 --- a/Sources/PackageGraph/GraphLoadingNode.swift +++ b/Sources/PackageGraph/GraphLoadingNode.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageLoading import PackageModel import TSCUtility diff --git a/Sources/PackageGraph/LocalPackageContainer.swift b/Sources/PackageGraph/LocalPackageContainer.swift index ebd6faa1d54..7f35a7dde0d 100644 --- a/Sources/PackageGraph/LocalPackageContainer.swift +++ b/Sources/PackageGraph/LocalPackageContainer.swift @@ -7,11 +7,8 @@ See http://swift.org/LICENSE.txt for license information See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ - -import Dispatch - import Basics -import TSCBasic +import Dispatch import PackageLoading import PackageModel import SourceControl diff --git a/Sources/PackageGraph/PackageGraph+Loading.swift b/Sources/PackageGraph/PackageGraph+Loading.swift index 8698aa9660e..e74f82c4526 100644 --- a/Sources/PackageGraph/PackageGraph+Loading.swift +++ b/Sources/PackageGraph/PackageGraph+Loading.swift @@ -12,7 +12,6 @@ import Basics import PackageLoading import PackageModel import SourceControl -import TSCBasic import TSCUtility extension PackageGraph { @@ -612,7 +611,7 @@ fileprivate func findCycle( _ successors: (GraphLoadingNode) throws -> [GraphLoadingNode] ) rethrows -> (path: [Manifest], cycle: [Manifest])? { // If this node is already in the current path then we have found a cycle. - if !path.append(node.manifest) { + if !path.append(node.manifest).inserted { let index = path.firstIndex(of: node.manifest)! // forced unwrap safe return (Array(path[path.startIndex.. 0, "An incompatibility must contain at least one term after normalization.") self.init(terms: OrderedSet(normalizedTerms), cause: cause) diff --git a/Sources/PackageGraph/Pubgrub/PartialSolution.swift b/Sources/PackageGraph/Pubgrub/PartialSolution.swift index 044a1694dfa..4f62b2dfdd2 100644 --- a/Sources/PackageGraph/Pubgrub/PartialSolution.swift +++ b/Sources/PackageGraph/Pubgrub/PartialSolution.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import struct TSCUtility.Version /// The partial solution is a constantly updated solution used throughout the diff --git a/Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift b/Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift index 57478dd4e1b..1ea76861bba 100644 --- a/Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift +++ b/Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift @@ -11,7 +11,6 @@ import Basics import Dispatch import PackageModel -import TSCBasic import TSCUtility /// The solver that is able to transitively resolve a set of package constraints diff --git a/Sources/PackageGraph/RepositoryPackageContainer.swift b/Sources/PackageGraph/RepositoryPackageContainer.swift index 088dc7eb9dc..3ff11c70e17 100644 --- a/Sources/PackageGraph/RepositoryPackageContainer.swift +++ b/Sources/PackageGraph/RepositoryPackageContainer.swift @@ -8,9 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Dispatch import Basics -import TSCBasic +import Dispatch import PackageLoading import PackageModel import SourceControl diff --git a/Sources/PackageGraph/ResolvedPackage.swift b/Sources/PackageGraph/ResolvedPackage.swift index 864acfd4158..8f8eb523d69 100644 --- a/Sources/PackageGraph/ResolvedPackage.swift +++ b/Sources/PackageGraph/ResolvedPackage.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel /// A fully resolved package. Contains resolved targets, products and dependencies of the package. diff --git a/Sources/PackageGraph/ResolvedProduct.swift b/Sources/PackageGraph/ResolvedProduct.swift index a2e70d2a586..882b68b6d18 100644 --- a/Sources/PackageGraph/ResolvedProduct.swift +++ b/Sources/PackageGraph/ResolvedProduct.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel public final class ResolvedProduct: ObjectIdentifierProtocol { diff --git a/Sources/PackageGraph/ResolvedTarget.swift b/Sources/PackageGraph/ResolvedTarget.swift index 04b3d383900..34e266dd2f6 100644 --- a/Sources/PackageGraph/ResolvedTarget.swift +++ b/Sources/PackageGraph/ResolvedTarget.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel /// Represents a fully resolved target. All the dependencies for the target are resolved. diff --git a/Sources/PackageLoading/Diagnostics.swift b/Sources/PackageLoading/Diagnostics.swift index 421d6c83660..a846501d45b 100644 --- a/Sources/PackageLoading/Diagnostics.swift +++ b/Sources/PackageLoading/Diagnostics.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import TSCUtility +import Basics import PackageModel +import TSCUtility extension Diagnostic.Message { static func targetHasNoSources(targetPath: String, target: String) -> Diagnostic.Message { diff --git a/Sources/PackageLoading/IdentityResolver.swift b/Sources/PackageLoading/IdentityResolver.swift index c135967f108..d582babec78 100644 --- a/Sources/PackageLoading/IdentityResolver.swift +++ b/Sources/PackageLoading/IdentityResolver.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel // TODO: refactor this when adding registry support diff --git a/Sources/PackageLoading/ManifestLoader.swift b/Sources/PackageLoading/ManifestLoader.swift index eecc917ae72..1abd6644887 100644 --- a/Sources/PackageLoading/ManifestLoader.swift +++ b/Sources/PackageLoading/ManifestLoader.swift @@ -9,11 +9,10 @@ */ import Basics -import TSCBasic -import PackageModel -import TSCUtility import Foundation +import PackageModel public typealias FileSystem = TSCBasic.FileSystem +import TSCUtility public enum ManifestParseError: Swift.Error { /// The manifest contains invalid format. diff --git a/Sources/PackageLoading/MinimumDeploymentTarget.swift b/Sources/PackageLoading/MinimumDeploymentTarget.swift index b8c0297b2ef..bad34c25cfe 100644 --- a/Sources/PackageLoading/MinimumDeploymentTarget.swift +++ b/Sources/PackageLoading/MinimumDeploymentTarget.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import PackageModel -import TSCBasic public struct MinimumDeploymentTarget { public let xcTestMinimumDeploymentTargets: [PackageModel.Platform:PlatformVersion] diff --git a/Sources/PackageLoading/ModuleMapGenerator.swift b/Sources/PackageLoading/ModuleMapGenerator.swift index e491c08821c..c747e484452 100644 --- a/Sources/PackageLoading/ModuleMapGenerator.swift +++ b/Sources/PackageLoading/ModuleMapGenerator.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import PackageModel +import Basics import Foundation +import PackageModel /// Name of the module map file recognized by the Clang and Swift compilers. public let moduleMapFilename = "module.modulemap" diff --git a/Sources/PackageLoading/PackageBuilder.swift b/Sources/PackageLoading/PackageBuilder.swift index 702c67c60bd..1b0bbd2584e 100644 --- a/Sources/PackageLoading/PackageBuilder.swift +++ b/Sources/PackageLoading/PackageBuilder.swift @@ -11,7 +11,6 @@ import Basics import Dispatch import PackageModel -import TSCBasic import TSCUtility /// An error in the structure or layout of a package. @@ -1192,7 +1191,7 @@ public final class PackageBuilder { /// Helper method to append to products array. func append(_ product: Product) { - let inserted = products.append(KeyedPair(product, key: product.name)) + let inserted = products.append(KeyedPair(product, key: product.name)).inserted if !inserted { diagnostics.emit( .duplicateProduct(product: product), diff --git a/Sources/PackageLoading/PackageDescription4Loader.swift b/Sources/PackageLoading/PackageDescription4Loader.swift index 1cc07e31443..814f0c895e3 100644 --- a/Sources/PackageLoading/PackageDescription4Loader.swift +++ b/Sources/PackageLoading/PackageDescription4Loader.swift @@ -9,11 +9,10 @@ */ import Basics -import TSCBasic -import TSCUtility -import PackageModel import Foundation +import PackageModel import SourceControl +import TSCUtility enum ManifestJSONParser { struct Result { diff --git a/Sources/PackageLoading/Target+PkgConfig.swift b/Sources/PackageLoading/Target+PkgConfig.swift index 262a9e0df58..e23d3ef7557 100644 --- a/Sources/PackageLoading/Target+PkgConfig.swift +++ b/Sources/PackageLoading/Target+PkgConfig.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import PackageModel import TSCUtility diff --git a/Sources/PackageLoading/TargetSourcesBuilder.swift b/Sources/PackageLoading/TargetSourcesBuilder.swift index 6b5b349b8c1..016d2498a26 100644 --- a/Sources/PackageLoading/TargetSourcesBuilder.swift +++ b/Sources/PackageLoading/TargetSourcesBuilder.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation -import TSCBasic import PackageModel import TSCUtility diff --git a/Sources/PackageLoading/ToolsVersionLoader.swift b/Sources/PackageLoading/ToolsVersionLoader.swift index 49fdf816b09..714d4219370 100644 --- a/Sources/PackageLoading/ToolsVersionLoader.swift +++ b/Sources/PackageLoading/ToolsVersionLoader.swift @@ -11,7 +11,6 @@ import Basics import Foundation import PackageModel -import TSCBasic import TSCUtility /// Protocol for the manifest loader interface. diff --git a/Sources/PackageLoading/UserManifestResources.swift b/Sources/PackageLoading/UserManifestResources.swift index 4c8d3146c85..c00c1447bdb 100644 --- a/Sources/PackageLoading/UserManifestResources.swift +++ b/Sources/PackageLoading/UserManifestResources.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics /// Concrete object for manifest resource provider. public struct UserManifestResources: ManifestResourceProvider { diff --git a/Sources/PackageModel/BuildSettings.swift b/Sources/PackageModel/BuildSettings.swift index 266b954fe14..be96eb5b04e 100644 --- a/Sources/PackageModel/BuildSettings.swift +++ b/Sources/PackageModel/BuildSettings.swift @@ -8,8 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - /// Namespace for build settings. public enum BuildSettings { diff --git a/Sources/PackageModel/Diagnostics.swift b/Sources/PackageModel/Diagnostics.swift index 38cae08c77e..eee84adbe90 100644 --- a/Sources/PackageModel/Diagnostics.swift +++ b/Sources/PackageModel/Diagnostics.swift @@ -8,8 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - +import Basics import Foundation import TSCUtility diff --git a/Sources/PackageModel/Manifest.swift b/Sources/PackageModel/Manifest.swift index 9a79c0b393a..07e8fc58dd1 100644 --- a/Sources/PackageModel/Manifest.swift +++ b/Sources/PackageModel/Manifest.swift @@ -9,9 +9,8 @@ */ import Basics -import TSCBasic -import TSCUtility import Foundation +import TSCUtility /// This contains the declarative specification loaded from package manifest /// files, and the tools for working with the manifest. diff --git a/Sources/PackageModel/Manifest/PackageDependencyDescription.swift b/Sources/PackageModel/Manifest/PackageDependencyDescription.swift index 9cee5af9f9d..051e9bee54a 100644 --- a/Sources/PackageModel/Manifest/PackageDependencyDescription.swift +++ b/Sources/PackageModel/Manifest/PackageDependencyDescription.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics /// Represents a package dependency. public enum PackageDependencyDescription: Equatable { diff --git a/Sources/PackageModel/ManifestSourceGeneration.swift b/Sources/PackageModel/ManifestSourceGeneration.swift index 39981856f07..5dc2acf8b38 100644 --- a/Sources/PackageModel/ManifestSourceGeneration.swift +++ b/Sources/PackageModel/ManifestSourceGeneration.swift @@ -8,9 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import TSCUtility import Foundation +import TSCUtility /// Extensions on Manifest for generating source code expressing its contents diff --git a/Sources/PackageModel/ModuleMapType.swift b/Sources/PackageModel/ModuleMapType.swift index a86d5104ae6..281867f3944 100644 --- a/Sources/PackageModel/ModuleMapType.swift +++ b/Sources/PackageModel/ModuleMapType.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility /// A type of module map layout. Contains all the information needed to generate or use a module map for a target that can have C-style headers. diff --git a/Sources/PackageModel/Package.swift b/Sources/PackageModel/Package.swift index b6bb47851e0..8cee47998ec 100644 --- a/Sources/PackageModel/Package.swift +++ b/Sources/PackageModel/Package.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility // Re-export Version from PackageModel, since it is a key part of the model. diff --git a/Sources/PackageModel/PackageIdentity.swift b/Sources/PackageModel/PackageIdentity.swift index 0c4dd2e026b..bfe063ca9af 100644 --- a/Sources/PackageModel/PackageIdentity.swift +++ b/Sources/PackageModel/PackageIdentity.swift @@ -8,9 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation - -import TSCBasic import TSCUtility /// When set to `false`, diff --git a/Sources/PackageModel/PackageReference.swift b/Sources/PackageModel/PackageReference.swift index 43e54f72075..bd3990f4403 100644 --- a/Sources/PackageModel/PackageReference.swift +++ b/Sources/PackageModel/PackageReference.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import TSCUtility /// A package reference. diff --git a/Sources/PackageModel/Product.swift b/Sources/PackageModel/Product.swift index 4fe0e92f1ba..08adf26350f 100644 --- a/Sources/PackageModel/Product.swift +++ b/Sources/PackageModel/Product.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility public class Product: Codable { diff --git a/Sources/PackageModel/Resource.swift b/Sources/PackageModel/Resource.swift index cbfb2c838a4..9d6b36dc7c5 100644 --- a/Sources/PackageModel/Resource.swift +++ b/Sources/PackageModel/Resource.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics /// An individual resource file and its corresponding rule. public struct Resource: Hashable, Codable { diff --git a/Sources/PackageModel/Sources.swift b/Sources/PackageModel/Sources.swift index 3a8ed01347a..2c9849b5df7 100644 --- a/Sources/PackageModel/Sources.swift +++ b/Sources/PackageModel/Sources.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility /// A grouping of related source files. diff --git a/Sources/PackageModel/SwiftLanguageVersion.swift b/Sources/PackageModel/SwiftLanguageVersion.swift index ead99cf97ac..30023ee3d80 100644 --- a/Sources/PackageModel/SwiftLanguageVersion.swift +++ b/Sources/PackageModel/SwiftLanguageVersion.swift @@ -8,8 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - +import Basics import Foundation import TSCUtility diff --git a/Sources/PackageModel/Target.swift b/Sources/PackageModel/Target.swift index 5184f65a46f..c74693faeea 100644 --- a/Sources/PackageModel/Target.swift +++ b/Sources/PackageModel/Target.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import TSCUtility public class Target: ObjectIdentifierProtocol, PolymorphicCodableProtocol { diff --git a/Sources/PackageModel/ToolsVersion.swift b/Sources/PackageModel/ToolsVersion.swift index d560258ecdc..4aa0def3e7d 100644 --- a/Sources/PackageModel/ToolsVersion.swift +++ b/Sources/PackageModel/ToolsVersion.swift @@ -10,7 +10,6 @@ import Basics import Foundation -import TSCBasic import TSCUtility /// Tools version represents version of the Swift toolchain. diff --git a/Sources/SPMBuildCore/ArtifactsArchiveMetadata.swift b/Sources/SPMBuildCore/ArtifactsArchiveMetadata.swift index 11a3a92160a..e8af1f1b756 100644 --- a/Sources/SPMBuildCore/ArtifactsArchiveMetadata.swift +++ b/Sources/SPMBuildCore/ArtifactsArchiveMetadata.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation import PackageModel -import TSCBasic import TSCUtility public struct ArtifactsArchiveMetadata: Equatable { diff --git a/Sources/SPMBuildCore/BinaryTarget+Extensions.swift b/Sources/SPMBuildCore/BinaryTarget+Extensions.swift index 2f58798b821..c9932bc41e5 100644 --- a/Sources/SPMBuildCore/BinaryTarget+Extensions.swift +++ b/Sources/SPMBuildCore/BinaryTarget+Extensions.swift @@ -8,14 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation import Basics +import Foundation import PackageModel import PackageGraph -import TSCBasic import TSCUtility - /// Information about a library from a binary dependency. public struct LibraryInfo: Equatable { /// The path to the binary. diff --git a/Sources/SPMBuildCore/BuildParameters.swift b/Sources/SPMBuildCore/BuildParameters.swift index 4a1bc184dd1..38dae92c2c5 100644 --- a/Sources/SPMBuildCore/BuildParameters.swift +++ b/Sources/SPMBuildCore/BuildParameters.swift @@ -8,12 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import class Foundation.ProcessInfo - -import TSCBasic -import TSCUtility import PackageModel import PackageGraph +import TSCUtility public struct BuildParameters: Encodable { /// Mode for the indexing-while-building feature. diff --git a/Sources/SPMBuildCore/BuiltTestProduct.swift b/Sources/SPMBuildCore/BuiltTestProduct.swift index 0cbea14b9bd..8538f61a68d 100644 --- a/Sources/SPMBuildCore/BuiltTestProduct.swift +++ b/Sources/SPMBuildCore/BuiltTestProduct.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics /// Represents a test product which is built and is present on disk. public struct BuiltTestProduct: Codable { diff --git a/Sources/SPMBuildCore/PluginInvocation.swift b/Sources/SPMBuildCore/PluginInvocation.swift index 1542f1726e0..e7235ddca93 100644 --- a/Sources/SPMBuildCore/PluginInvocation.swift +++ b/Sources/SPMBuildCore/PluginInvocation.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation import Basics +import Foundation import PackageModel import PackageGraph -import TSCBasic import TSCUtility diff --git a/Sources/SPMBuildCore/PrebuildCommandResult.swift b/Sources/SPMBuildCore/PrebuildCommandResult.swift index cc4c66af006..e755db344ae 100644 --- a/Sources/SPMBuildCore/PrebuildCommandResult.swift +++ b/Sources/SPMBuildCore/PrebuildCommandResult.swift @@ -9,8 +9,6 @@ */ import Basics -import TSCBasic - /// Represents the result of running prebuild commands for a single plugin invocation for a target. public struct PrebuildCommandResult { diff --git a/Sources/SPMBuildCore/Sanitizers.swift b/Sources/SPMBuildCore/Sanitizers.swift index a5fb0a01e18..a53702e7ed7 100644 --- a/Sources/SPMBuildCore/Sanitizers.swift +++ b/Sources/SPMBuildCore/Sanitizers.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import TSCUtility /// Available runtime sanitizers. diff --git a/Sources/SPMBuildCore/Toolchain.swift b/Sources/SPMBuildCore/Toolchain.swift index 1b21ace59d7..60a46f9c55d 100644 --- a/Sources/SPMBuildCore/Toolchain.swift +++ b/Sources/SPMBuildCore/Toolchain.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageModel public protocol Toolchain { diff --git a/Sources/SPMBuildCore/XCFrameworkMetadata.swift b/Sources/SPMBuildCore/XCFrameworkMetadata.swift index 73024ecb6f7..bd2cde01cd3 100644 --- a/Sources/SPMBuildCore/XCFrameworkMetadata.swift +++ b/Sources/SPMBuildCore/XCFrameworkMetadata.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation import PackageModel -import TSCBasic import TSCUtility public struct XCFrameworkMetadata: Equatable { diff --git a/Sources/SPMPackageEditor/PackageEditor.swift b/Sources/SPMPackageEditor/PackageEditor.swift index 3e99b6b2362..645731bc82b 100644 --- a/Sources/SPMPackageEditor/PackageEditor.swift +++ b/Sources/SPMPackageEditor/PackageEditor.swift @@ -8,13 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCUtility -import TSCBasic +import Foundation import SourceControl import PackageLoading import PackageModel +import TSCUtility import Workspace -import Foundation /// An editor for Swift packages. /// diff --git a/Sources/SPMTestSupport/GitRepositoryExtensions.swift b/Sources/SPMTestSupport/GitRepositoryExtensions.swift index 1f62cd3df95..03cea087b16 100644 --- a/Sources/SPMTestSupport/GitRepositoryExtensions.swift +++ b/Sources/SPMTestSupport/GitRepositoryExtensions.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import TSCUtility +import Basics import SourceControl +import TSCUtility /// Extensions useful for unit testing purposes. /// Note: These are not thread safe. diff --git a/Sources/SPMTestSupport/InMemoryGitRepository.swift b/Sources/SPMTestSupport/InMemoryGitRepository.swift index 5a9091ad783..f06f1eb5e8d 100644 --- a/Sources/SPMTestSupport/InMemoryGitRepository.swift +++ b/Sources/SPMTestSupport/InMemoryGitRepository.swift @@ -9,11 +9,10 @@ */ import Basics -import TSCBasic -import TSCUtility -import SourceControl import Dispatch import class Foundation.NSUUID +import SourceControl +import TSCUtility /// The error encountered during in memory git repository operations. public enum InMemoryGitRepositoryError: Swift.Error { diff --git a/Sources/SPMTestSupport/ManifestExtensions.swift b/Sources/SPMTestSupport/ManifestExtensions.swift index 73dac95e574..f77ecc2d10a 100644 --- a/Sources/SPMTestSupport/ManifestExtensions.swift +++ b/Sources/SPMTestSupport/ManifestExtensions.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import PackageModel -import TSCBasic import TSCUtility public extension Manifest { diff --git a/Sources/SPMTestSupport/MockArchiver.swift b/Sources/SPMTestSupport/MockArchiver.swift index bff0aaca13a..eebe137e0d6 100644 --- a/Sources/SPMTestSupport/MockArchiver.swift +++ b/Sources/SPMTestSupport/MockArchiver.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import TSCUtility public class MockArchiver: Archiver { diff --git a/Sources/SPMTestSupport/MockDependency.swift b/Sources/SPMTestSupport/MockDependency.swift index 684f47e8ed9..d5539e16129 100644 --- a/Sources/SPMTestSupport/MockDependency.swift +++ b/Sources/SPMTestSupport/MockDependency.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import PackageLoading import PackageModel -import TSCBasic public struct MockDependency { public typealias Requirement = PackageDependencyDescription.Requirement diff --git a/Sources/SPMTestSupport/MockDependencyGraph.swift b/Sources/SPMTestSupport/MockDependencyGraph.swift index 4ecc0d04055..fa5ae709139 100644 --- a/Sources/SPMTestSupport/MockDependencyGraph.swift +++ b/Sources/SPMTestSupport/MockDependencyGraph.swift @@ -7,12 +7,12 @@ See http://swift.org/LICENSE.txt for license information See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest +import Basics import PackageGraph import PackageModel -import TSCBasic import struct TSCUtility.Version +import XCTest public struct MockDependencyGraph { public let name: String diff --git a/Sources/SPMTestSupport/MockHTTPClient.swift b/Sources/SPMTestSupport/MockHTTPClient.swift index a374c2c27ef..86e9a3638f8 100644 --- a/Sources/SPMTestSupport/MockHTTPClient.swift +++ b/Sources/SPMTestSupport/MockHTTPClient.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import TSCUtility extension HTTPClient { diff --git a/Sources/SPMTestSupport/MockHashAlgorithm.swift b/Sources/SPMTestSupport/MockHashAlgorithm.swift index d95d7dfc43c..bcc4cc93919 100644 --- a/Sources/SPMTestSupport/MockHashAlgorithm.swift +++ b/Sources/SPMTestSupport/MockHashAlgorithm.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic public class MockHashAlgorithm: HashAlgorithm { public typealias Handler = (ByteString) -> ByteString diff --git a/Sources/SPMTestSupport/MockManifestLoader.swift b/Sources/SPMTestSupport/MockManifestLoader.swift index 10ca83e303f..e4076ca41a4 100644 --- a/Sources/SPMTestSupport/MockManifestLoader.swift +++ b/Sources/SPMTestSupport/MockManifestLoader.swift @@ -8,15 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import func XCTest.XCTFail -import Dispatch - import Basics -import TSCBasic +import Dispatch import PackageModel import PackageLoading import PackageGraph import TSCUtility +import func XCTest.XCTFail public enum MockManifestLoaderError: Swift.Error { case unknownRequest(String) diff --git a/Sources/SPMTestSupport/MockPackageContainer.swift b/Sources/SPMTestSupport/MockPackageContainer.swift index c33b116df37..b6af2de79a4 100644 --- a/Sources/SPMTestSupport/MockPackageContainer.swift +++ b/Sources/SPMTestSupport/MockPackageContainer.swift @@ -7,15 +7,14 @@ See http://swift.org/LICENSE.txt for license information See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Dispatch -import XCTest +import Basics +import Dispatch import PackageGraph import PackageModel import SourceControl -import TSCBasic - import struct TSCUtility.Version +import XCTest public class MockPackageContainer: PackageContainer { public typealias Constraint = PackageContainerConstraint diff --git a/Sources/SPMTestSupport/MockWorkspace.swift b/Sources/SPMTestSupport/MockWorkspace.swift index 52544d26181..117bbb301fa 100644 --- a/Sources/SPMTestSupport/MockWorkspace.swift +++ b/Sources/SPMTestSupport/MockWorkspace.swift @@ -13,7 +13,6 @@ import Basics import PackageLoading import PackageModel import SourceControl -import TSCBasic import Workspace import XCTest diff --git a/Sources/SPMTestSupport/PIFTester.swift b/Sources/SPMTestSupport/PIFTester.swift index 607fce428c8..4076447822f 100644 --- a/Sources/SPMTestSupport/PIFTester.swift +++ b/Sources/SPMTestSupport/PIFTester.swift @@ -8,9 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import XCTest +import Basics import XCBuildSupport +import XCTest public func PIFTester(_ pif: PIF.TopLevelObject, _ body: (PIFWorkspaceTester) -> Void) { body(PIFWorkspaceTester(workspace: pif.workspace)) diff --git a/Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift b/Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift index 8294d265c7d..110998f5234 100644 --- a/Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift +++ b/Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import PackageModel -import TSCBasic public extension PackageDependencyDescription { static func local(identity: PackageIdentity? = nil, diff --git a/Sources/SPMTestSupport/Resources.swift b/Sources/SPMTestSupport/Resources.swift index 3e7f6c348f4..009496467cd 100644 --- a/Sources/SPMTestSupport/Resources.swift +++ b/Sources/SPMTestSupport/Resources.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import SPMBuildCore import Foundation import PackageLoading +import SPMBuildCore import Workspace #if os(macOS) diff --git a/Sources/SPMTestSupport/SwiftPMProduct.swift b/Sources/SPMTestSupport/SwiftPMProduct.swift index d6d41fd2905..1477528f87f 100644 --- a/Sources/SPMTestSupport/SwiftPMProduct.swift +++ b/Sources/SPMTestSupport/SwiftPMProduct.swift @@ -8,8 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic - +import Basics @_exported import TSCTestSupport public enum SwiftPMProduct: Product { diff --git a/Sources/SPMTestSupport/XCTAssertHelpers.swift b/Sources/SPMTestSupport/XCTAssertHelpers.swift index 5a405e050c0..a4f97666f6e 100644 --- a/Sources/SPMTestSupport/XCTAssertHelpers.swift +++ b/Sources/SPMTestSupport/XCTAssertHelpers.swift @@ -8,16 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility - +import Basics #if os(macOS) import class Foundation.Bundle #endif - +import TSCUtility @_exported import TSCTestSupport +import XCTest public func XCTAssertBuilds( _ path: AbsolutePath, diff --git a/Sources/SPMTestSupport/misc.swift b/Sources/SPMTestSupport/misc.swift index 27bcdd7c9cf..16040054e5e 100644 --- a/Sources/SPMTestSupport/misc.swift +++ b/Sources/SPMTestSupport/misc.swift @@ -8,22 +8,15 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import class Foundation.NSDate -import class Foundation.Thread -import func XCTest.XCTFail - +@_exported import Basics +@_exported import Foundation import PackageGraph import PackageModel import SourceControl -import TSCBasic -import TSCUtility -import Workspace - @_exported import TSCTestSupport - -#if os(macOS) -import class Foundation.Bundle -#endif +@_exported import TSCUtility +import Workspace +import func XCTest.XCTFail /// Test-helper function that runs a block of code on a copy of a test fixture /// package. The copy is made into a temporary directory, and the block is diff --git a/Sources/SourceControl/GitRepository.swift b/Sources/SourceControl/GitRepository.swift index 1648137d153..5c2150e27be 100644 --- a/Sources/SourceControl/GitRepository.swift +++ b/Sources/SourceControl/GitRepository.swift @@ -10,7 +10,6 @@ import Basics import Dispatch -import TSCBasic import TSCUtility // MARK: - GitShellHelper diff --git a/Sources/SourceControl/Repository.swift b/Sources/SourceControl/Repository.swift index 63bb355d240..b728379bc5a 100644 --- a/Sources/SourceControl/Repository.swift +++ b/Sources/SourceControl/Repository.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics /// Specifies a repository address. public struct RepositorySpecifier: Hashable, Codable { diff --git a/Sources/SourceControl/RepositoryManager.swift b/Sources/SourceControl/RepositoryManager.swift index faf96cce2ae..d549112fa25 100644 --- a/Sources/SourceControl/RepositoryManager.swift +++ b/Sources/SourceControl/RepositoryManager.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Dispatch import class Foundation.OperationQueue - -import TSCBasic import TSCUtility -import Basics /// Delegate to notify clients about actions being performed by RepositoryManager. public protocol RepositoryManagerDelegate: AnyObject { diff --git a/Sources/Workspace/DefaultPluginScriptRunner.swift b/Sources/Workspace/DefaultPluginScriptRunner.swift index 048e0b8933c..3bbce2f3669 100644 --- a/Sources/Workspace/DefaultPluginScriptRunner.swift +++ b/Sources/Workspace/DefaultPluginScriptRunner.swift @@ -14,7 +14,6 @@ import PackageGraph import PackageLoading // for ManifestResourceProvider import PackageModel import SPMBuildCore -import TSCBasic import TSCUtility /// A plugin script runner that compiles the plugin source files as an executable binary for the host platform, and invokes it as a subprocess. diff --git a/Sources/Workspace/Destination.swift b/Sources/Workspace/Destination.swift index edf1db57cd1..44ed8f2341d 100644 --- a/Sources/Workspace/Destination.swift +++ b/Sources/Workspace/Destination.swift @@ -1,6 +1,15 @@ -import TSCBasic -import TSCUtility +/* + This source file is part of the Swift.org open source project + + Copyright (c) 2021 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 + See http://swift.org/CONTRIBUTORS.txt for Swift project authors + */ + import SPMBuildCore +import TSCUtility public enum DestinationError: Swift.Error { /// Couldn't find the Xcode installation. diff --git a/Sources/Workspace/Diagnostics.swift b/Sources/Workspace/Diagnostics.swift index b325ab5e654..11309837495 100644 --- a/Sources/Workspace/Diagnostics.swift +++ b/Sources/Workspace/Diagnostics.swift @@ -8,12 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import TSCUtility -import PackageModel -import PackageLoading -import PackageGraph +import Basics import Foundation +import PackageGraph +import PackageLoading +import PackageModel +import TSCUtility public struct ManifestParseDiagnostic: DiagnosticData { public let errors: [String] diff --git a/Sources/Workspace/InitPackage.swift b/Sources/Workspace/InitPackage.swift index babab04e9de..b71c4132ee4 100644 --- a/Sources/Workspace/InitPackage.swift +++ b/Sources/Workspace/InitPackage.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import PackageModel /// Create an initial template package. diff --git a/Sources/Workspace/ManagedArtifact.swift b/Sources/Workspace/ManagedArtifact.swift index 73626e31789..1bc29e6a00b 100644 --- a/Sources/Workspace/ManagedArtifact.swift +++ b/Sources/Workspace/ManagedArtifact.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageGraph import PackageModel import SourceControl diff --git a/Sources/Workspace/ManagedDependency.swift b/Sources/Workspace/ManagedDependency.swift index addc4d22013..464c01a4449 100644 --- a/Sources/Workspace/ManagedDependency.swift +++ b/Sources/Workspace/ManagedDependency.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageGraph import PackageModel import SourceControl diff --git a/Sources/Workspace/ResolverPrecomputationProvider.swift b/Sources/Workspace/ResolverPrecomputationProvider.swift index 42d69bd0bee..3c4cc803b39 100644 --- a/Sources/Workspace/ResolverPrecomputationProvider.swift +++ b/Sources/Workspace/ResolverPrecomputationProvider.swift @@ -9,11 +9,10 @@ */ import Dispatch -import PackageModel import PackageGraph -import TSCBasic -import TSCUtility +import PackageModel import SourceControl +import TSCUtility /// Enumeration of the different errors that can arise from the `ResolverPrecomputationProvider` provider. enum ResolverPrecomputationError: Error { diff --git a/Sources/Workspace/ToolsVersionWriter.swift b/Sources/Workspace/ToolsVersionWriter.swift index e54d2af41c1..ea840adc289 100644 --- a/Sources/Workspace/ToolsVersionWriter.swift +++ b/Sources/Workspace/ToolsVersionWriter.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageModel import PackageLoading import TSCUtility diff --git a/Sources/Workspace/UserToolchain.swift b/Sources/Workspace/UserToolchain.swift index c5bbd0d8240..3782499ba75 100644 --- a/Sources/Workspace/UserToolchain.swift +++ b/Sources/Workspace/UserToolchain.swift @@ -9,11 +9,10 @@ */ import Basics -import TSCBasic -import TSCUtility +import Foundation import PackageLoading import SPMBuildCore -import Foundation +import TSCUtility #if os(Windows) private let hostExecutableSuffix = ".exe" diff --git a/Sources/Workspace/WindowsToolchainInfo.swift b/Sources/Workspace/WindowsToolchainInfo.swift index c39e0f174d8..6d565d8e121 100644 --- a/Sources/Workspace/WindowsToolchainInfo.swift +++ b/Sources/Workspace/WindowsToolchainInfo.swift @@ -9,7 +9,6 @@ */ import Foundation -import TSCBasic public struct WindowsSDKSettings { public struct DefaultProperties { diff --git a/Sources/Workspace/Workspace.swift b/Sources/Workspace/Workspace.swift index fdde5cb7655..6ca43412dfc 100644 --- a/Sources/Workspace/Workspace.swift +++ b/Sources/Workspace/Workspace.swift @@ -9,13 +9,12 @@ */ import Basics -import TSCBasic -import TSCUtility import Foundation +import PackageGraph import PackageLoading import PackageModel -import PackageGraph import SourceControl +import TSCUtility /// Enumeration of the different reasons for which the resolver needs to be run. public enum WorkspaceResolveReason: Equatable { diff --git a/Sources/Workspace/WorkspaceConfiguration.swift b/Sources/Workspace/WorkspaceConfiguration.swift index 708aebc35bc..17338cab3ac 100644 --- a/Sources/Workspace/WorkspaceConfiguration.swift +++ b/Sources/Workspace/WorkspaceConfiguration.swift @@ -9,11 +9,8 @@ */ import Foundation - -import TSCBasic -import TSCUtility - import PackageGraph +import TSCUtility extension Workspace { /// Manages a package workspace's configuration. diff --git a/Sources/Workspace/WorkspaceState.swift b/Sources/Workspace/WorkspaceState.swift index f4ec70559fe..81d720bd4c6 100644 --- a/Sources/Workspace/WorkspaceState.swift +++ b/Sources/Workspace/WorkspaceState.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import PackageGraph import PackageModel import SourceControl diff --git a/Sources/XCBuildSupport/PIF.swift b/Sources/XCBuildSupport/PIF.swift index a9f576201d3..fa5a3968dab 100644 --- a/Sources/XCBuildSupport/PIF.swift +++ b/Sources/XCBuildSupport/PIF.swift @@ -10,7 +10,6 @@ import Basics import Foundation -import TSCBasic import PackageModel /// The Project Interchange Format (PIF) is a structured representation of the diff --git a/Sources/XCBuildSupport/PIFBuilder.swift b/Sources/XCBuildSupport/PIFBuilder.swift index 62a96b150c5..4f4ce7e43a0 100644 --- a/Sources/XCBuildSupport/PIFBuilder.swift +++ b/Sources/XCBuildSupport/PIFBuilder.swift @@ -8,15 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation - -import TSCBasic -import TSCUtility - import Basics -import PackageModel -import PackageLoading +import Foundation import PackageGraph +import PackageLoading +import PackageModel +import TSCUtility /// The parameters required by `PIFBuilder`. public struct PIFBuilderParameters { diff --git a/Sources/XCBuildSupport/XCBuildDelegate.swift b/Sources/XCBuildSupport/XCBuildDelegate.swift index 845cb28a0f0..4f24e700434 100644 --- a/Sources/XCBuildSupport/XCBuildDelegate.swift +++ b/Sources/XCBuildSupport/XCBuildDelegate.swift @@ -8,10 +8,10 @@ See http://swift.org/LICENSE.txt for license information See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation -import TSCBasic -import TSCUtility import SPMBuildCore +import TSCUtility public class XCBuildDelegate { private let buildSystem: SPMBuildCore.BuildSystem diff --git a/Sources/XCBuildSupport/XCBuildMessage.swift b/Sources/XCBuildSupport/XCBuildMessage.swift index 9123b53abcf..448ab2522be 100644 --- a/Sources/XCBuildSupport/XCBuildMessage.swift +++ b/Sources/XCBuildSupport/XCBuildMessage.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Foundation -import TSCBasic import TSCUtility /// Represents a message output by xcbuild. diff --git a/Sources/XCBuildSupport/XCBuildOutputParser.swift b/Sources/XCBuildSupport/XCBuildOutputParser.swift index e1fc19b3c16..1697e0d8cf9 100644 --- a/Sources/XCBuildSupport/XCBuildOutputParser.swift +++ b/Sources/XCBuildSupport/XCBuildOutputParser.swift @@ -9,7 +9,6 @@ */ import Foundation -import TSCBasic import TSCUtility /// Protocol for the parser delegate to get notified of parsing events. diff --git a/Sources/XCBuildSupport/XcodeBuildSystem.swift b/Sources/XCBuildSupport/XcodeBuildSystem.swift index 86401f2e70a..16247e6abdc 100644 --- a/Sources/XCBuildSupport/XcodeBuildSystem.swift +++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift @@ -8,13 +8,12 @@ See http://swift.org/LICENSE.txt for license information See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import class Foundation.JSONEncoder - -import TSCBasic -import TSCUtility -import PackageModel import PackageGraph +import PackageModel import SPMBuildCore +import TSCUtility public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { private let buildParameters: BuildParameters diff --git a/Sources/Xcodeproj/SchemesGenerator.swift b/Sources/Xcodeproj/SchemesGenerator.swift index 2ba4d124f71..f067b6335ff 100644 --- a/Sources/Xcodeproj/SchemesGenerator.swift +++ b/Sources/Xcodeproj/SchemesGenerator.swift @@ -8,7 +8,7 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageGraph import PackageModel diff --git a/Sources/Xcodeproj/Target+PBXProj.swift b/Sources/Xcodeproj/Target+PBXProj.swift index 4ea1b184abc..1f2429182e3 100644 --- a/Sources/Xcodeproj/Target+PBXProj.swift +++ b/Sources/Xcodeproj/Target+PBXProj.swift @@ -23,9 +23,8 @@ layer for these properties we satisfy the above constraints. */ +import Basics import Foundation - -import TSCBasic import PackageGraph import PackageLoading diff --git a/Sources/Xcodeproj/generate.swift b/Sources/Xcodeproj/generate.swift index c864585e2d4..f3029b4f232 100644 --- a/Sources/Xcodeproj/generate.swift +++ b/Sources/Xcodeproj/generate.swift @@ -8,10 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic +import Basics import PackageGraph -import PackageModel import PackageLoading +import PackageModel import SourceControl import TSCUtility diff --git a/Sources/Xcodeproj/pbxproj.swift b/Sources/Xcodeproj/pbxproj.swift index 611331a8867..abec350e4a6 100644 --- a/Sources/Xcodeproj/pbxproj.swift +++ b/Sources/Xcodeproj/pbxproj.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import PackageGraph import PackageModel import PackageLoading diff --git a/Sources/swift-package/main.swift b/Sources/swift-package/main.swift index e206219e1b7..09241c6c2e9 100644 --- a/Sources/swift-package/main.swift +++ b/Sources/swift-package/main.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Commands -import TSCBasic let firstArg = CommandLine.arguments[0] let execName = (try? AbsolutePath(validating: firstArg).basenameWithoutExt) ?? diff --git a/Sources/swiftpm-manifest-tool/main.swift b/Sources/swiftpm-manifest-tool/main.swift index 7f84d1ed9c3..342ab037f37 100644 --- a/Sources/swiftpm-manifest-tool/main.swift +++ b/Sources/swiftpm-manifest-tool/main.swift @@ -10,12 +10,11 @@ import Basics import Foundation -import TSCBasic -import TSCUtility +import class PackageModel.Manifest import func POSIX.exit - import SPMPackageEditor -import class PackageModel.Manifest +import TSCUtility + enum ToolError: Error { case error(String) diff --git a/Tests/BasicsTests/ByteStringExtensionsTests.swift b/Tests/BasicsTests/ByteStringExtensionsTests.swift index ac2e141ddd0..0c018cbe3b3 100644 --- a/Tests/BasicsTests/ByteStringExtensionsTests.swift +++ b/Tests/BasicsTests/ByteStringExtensionsTests.swift @@ -9,7 +9,6 @@ */ import Basics -import TSCBasic import XCTest final class ByteStringExtensionsTests: XCTestCase { diff --git a/Tests/BasicsTests/ConcurrencyHelpersTests.swift b/Tests/BasicsTests/ConcurrencyHelpersTests.swift index 7c391fe351e..d9059910491 100644 --- a/Tests/BasicsTests/ConcurrencyHelpersTests.swift +++ b/Tests/BasicsTests/ConcurrencyHelpersTests.swift @@ -9,7 +9,6 @@ */ @testable import Basics -import TSCBasic import TSCTestSupport import XCTest diff --git a/Tests/BasicsTests/SQLiteBackedCacheTests.swift b/Tests/BasicsTests/SQLiteBackedCacheTests.swift index 6ce636bfad5..e96b80fb198 100644 --- a/Tests/BasicsTests/SQLiteBackedCacheTests.swift +++ b/Tests/BasicsTests/SQLiteBackedCacheTests.swift @@ -9,7 +9,6 @@ */ @testable import Basics -import TSCBasic import TSCTestSupport import TSCUtility import XCTest diff --git a/Tests/BasicsTests/SandboxTests.swift b/Tests/BasicsTests/SandboxTests.swift index 1457c3859df..4f2aa761dc8 100644 --- a/Tests/BasicsTests/SandboxTests.swift +++ b/Tests/BasicsTests/SandboxTests.swift @@ -9,7 +9,6 @@ */ @testable import Basics -import TSCBasic import TSCUtility import XCTest diff --git a/Tests/BasicsTests/URLSessionHTTPClientTests.swift b/Tests/BasicsTests/URLSessionHTTPClientTests.swift index 83cb03f949f..46c99794812 100644 --- a/Tests/BasicsTests/URLSessionHTTPClientTests.swift +++ b/Tests/BasicsTests/URLSessionHTTPClientTests.swift @@ -15,7 +15,6 @@ import Foundation // need to decide how to best deal with that import FoundationNetworking #endif -import TSCBasic import TSCTestSupport import struct TSCUtility.Netrc import XCTest diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift index 00ab8190e97..29da14351f8 100644 --- a/Tests/BuildTests/BuildPlanTests.swift +++ b/Tests/BuildTests/BuildPlanTests.swift @@ -14,8 +14,6 @@ import PackageModel import SPMBuildCore import SPMTestSupport import SwiftDriver -import TSCBasic -import TSCUtility import XCTest let hostTriple = Resources.default.toolchain.triple diff --git a/Tests/BuildTests/IncrementalBuildTests.swift b/Tests/BuildTests/IncrementalBuildTests.swift index 0ea96e6d518..e6dd8ee1b42 100644 --- a/Tests/BuildTests/IncrementalBuildTests.swift +++ b/Tests/BuildTests/IncrementalBuildTests.swift @@ -8,12 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - import SPMTestSupport -import TSCBasic -import TSCUtility - +import XCTest /// Functional tests of incremental builds. These are fairly ad hoc at this /// point, and because of the time they take, they need to be kept minimal. diff --git a/Tests/BuildTests/LLBuildManifestTests.swift b/Tests/BuildTests/LLBuildManifestTests.swift index 2e3482dc163..da7d46e0c94 100644 --- a/Tests/BuildTests/LLBuildManifestTests.swift +++ b/Tests/BuildTests/LLBuildManifestTests.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic +import Basics import LLBuildManifest +import XCTest // FIXME: This should be in its own test target. final class LLBuildManifestTests: XCTestCase { diff --git a/Tests/CommandsTests/APIDiffTests.swift b/Tests/CommandsTests/APIDiffTests.swift index e7a72b73389..3138c2aa02e 100644 --- a/Tests/CommandsTests/APIDiffTests.swift +++ b/Tests/CommandsTests/APIDiffTests.swift @@ -8,11 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import Foundation -import TSCBasic import Commands import SPMTestSupport +import XCTest final class APIDiffTests: XCTestCase { @discardableResult diff --git a/Tests/CommandsTests/BuildToolTests.swift b/Tests/CommandsTests/BuildToolTests.swift index b445c8796e8..91e88335c0e 100644 --- a/Tests/CommandsTests/BuildToolTests.swift +++ b/Tests/CommandsTests/BuildToolTests.swift @@ -8,13 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import SPMTestSupport -import TSCBasic -import SPMBuildCore import Commands +import SPMBuildCore +import SPMTestSupport import Workspace +import XCTest struct BuildResult { let binPath: AbsolutePath diff --git a/Tests/CommandsTests/MultiRootSupportTests.swift b/Tests/CommandsTests/MultiRootSupportTests.swift index b1d8c5ef40b..36eee2306f9 100644 --- a/Tests/CommandsTests/MultiRootSupportTests.swift +++ b/Tests/CommandsTests/MultiRootSupportTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import SPMTestSupport -import TSCBasic import Commands +import SPMTestSupport import Workspace +import XCTest final class MultiRootSupportTests: XCTestCase { diff --git a/Tests/CommandsTests/PackageToolTests.swift b/Tests/CommandsTests/PackageToolTests.swift index 2e351b50a4f..8c647101cb9 100644 --- a/Tests/CommandsTests/PackageToolTests.swift +++ b/Tests/CommandsTests/PackageToolTests.swift @@ -8,17 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import Foundation - -import TSCBasic import Commands -import Xcodeproj import PackageModel import SourceControl import SPMTestSupport -import TSCUtility import Workspace +import Xcodeproj +import XCTest final class PackageToolTests: XCTestCase { @discardableResult diff --git a/Tests/CommandsTests/RunToolTests.swift b/Tests/CommandsTests/RunToolTests.swift index c18974ef801..01e5cbb88a7 100644 --- a/Tests/CommandsTests/RunToolTests.swift +++ b/Tests/CommandsTests/RunToolTests.swift @@ -8,11 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import SPMTestSupport import Commands -import TSCBasic +import SPMTestSupport +import XCTest final class RunToolTests: XCTestCase { private func execute( diff --git a/Tests/CommandsTests/TestToolTests.swift b/Tests/CommandsTests/TestToolTests.swift index a894873dc1e..6c966c6d6e1 100644 --- a/Tests/CommandsTests/TestToolTests.swift +++ b/Tests/CommandsTests/TestToolTests.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import SPMTestSupport import Commands +import SPMTestSupport +import XCTest final class TestToolTests: XCTestCase { private func execute(_ args: [String]) throws -> (stdout: String, stderr: String) { diff --git a/Tests/FunctionalPerformanceTests/BuildPerfTests.swift b/Tests/FunctionalPerformanceTests/BuildPerfTests.swift index 9043beb35f4..614deb39aa6 100644 --- a/Tests/FunctionalPerformanceTests/BuildPerfTests.swift +++ b/Tests/FunctionalPerformanceTests/BuildPerfTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import Commands import SPMTestSupport -import TSCBasic -import TSCUtility import Workspace +import XCTest class BuildPerfTests: XCTestCasePerf { diff --git a/Tests/FunctionalTests/CFamilyTargetTests.swift b/Tests/FunctionalTests/CFamilyTargetTests.swift index 8e3ed359f91..bcc3c3cfea6 100644 --- a/Tests/FunctionalTests/CFamilyTargetTests.swift +++ b/Tests/FunctionalTests/CFamilyTargetTests.swift @@ -8,14 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import Commands -import SPMTestSupport -import TSCBasic import PackageModel import SourceControl -import TSCUtility +import SPMTestSupport import Workspace +import XCTest typealias Process = TSCBasic.Process diff --git a/Tests/FunctionalTests/DependencyResolutionTests.swift b/Tests/FunctionalTests/DependencyResolutionTests.swift index cf26fc64886..720bbe8eaa1 100644 --- a/Tests/FunctionalTests/DependencyResolutionTests.swift +++ b/Tests/FunctionalTests/DependencyResolutionTests.swift @@ -8,13 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import Commands import SPMTestSupport import SourceControl import Workspace +import XCTest class DependencyResolutionTests: XCTestCase { func testInternalSimple() { diff --git a/Tests/FunctionalTests/MiscellaneousTests.swift b/Tests/FunctionalTests/MiscellaneousTests.swift index e9b661909f8..b485500b508 100644 --- a/Tests/FunctionalTests/MiscellaneousTests.swift +++ b/Tests/FunctionalTests/MiscellaneousTests.swift @@ -8,17 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import SPMTestSupport -import TSCBasic import PackageModel -import TSCUtility -import TSCLibc -import class Foundation.ProcessInfo -import class Foundation.Thread import SourceControl import SPMTestSupport +import TSCLibc import Workspace +import XCTest typealias ProcessID = TSCBasic.Process.ProcessID diff --git a/Tests/FunctionalTests/ModuleMapTests.swift b/Tests/FunctionalTests/ModuleMapTests.swift index de1a04aba0e..ba3bcadf8f1 100644 --- a/Tests/FunctionalTests/ModuleMapTests.swift +++ b/Tests/FunctionalTests/ModuleMapTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import Commands import SPMTestSupport -import TSCBasic -import TSCUtility import Workspace +import XCTest class ModuleMapsTestCase: XCTestCase { diff --git a/Tests/FunctionalTests/PluginTests.swift b/Tests/FunctionalTests/PluginTests.swift index ab5f6074f78..d79da386115 100644 --- a/Tests/FunctionalTests/PluginTests.swift +++ b/Tests/FunctionalTests/PluginTests.swift @@ -8,9 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import SPMTestSupport -import TSCBasic +import XCTest class PluginTests: XCTestCase { diff --git a/Tests/FunctionalTests/ResourcesTests.swift b/Tests/FunctionalTests/ResourcesTests.swift index 0a8e59f12d5..2b5a353877c 100644 --- a/Tests/FunctionalTests/ResourcesTests.swift +++ b/Tests/FunctionalTests/ResourcesTests.swift @@ -8,10 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import SPMTestSupport - -import TSCBasic +import XCTest class ResourcesTests: XCTestCase { func testSimpleResources() { diff --git a/Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift b/Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift index 310708b1ec7..8684f443b3b 100644 --- a/Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift +++ b/Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import SPMTestSupport -import XCTest -import TSCUtility import Commands +import SPMTestSupport import Workspace +import XCTest class SwiftPMXCTestHelperTests: XCTestCase { func testBasicXCTestHelper() throws { diff --git a/Tests/FunctionalTests/TestDiscoveryTests.swift b/Tests/FunctionalTests/TestDiscoveryTests.swift index a70f61c9425..a9ff550e811 100644 --- a/Tests/FunctionalTests/TestDiscoveryTests.swift +++ b/Tests/FunctionalTests/TestDiscoveryTests.swift @@ -10,7 +10,6 @@ import PackageModel import SPMTestSupport -import TSCBasic import XCTest class TestDiscoveryTests: XCTestCase { diff --git a/Tests/FunctionalTests/ToolsVersionTests.swift b/Tests/FunctionalTests/ToolsVersionTests.swift index aeb63a88b87..07dea265c9a 100644 --- a/Tests/FunctionalTests/ToolsVersionTests.swift +++ b/Tests/FunctionalTests/ToolsVersionTests.swift @@ -8,15 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import Commands import PackageModel import SourceControl +import SPMTestSupport import Workspace +import XCTest class ToolsVersionTests: XCTestCase { diff --git a/Tests/FunctionalTests/VersionSpecificTests.swift b/Tests/FunctionalTests/VersionSpecificTests.swift index 56ec1187dc5..af64a7385fa 100644 --- a/Tests/FunctionalTests/VersionSpecificTests.swift +++ b/Tests/FunctionalTests/VersionSpecificTests.swift @@ -8,11 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Basics import SourceControl import SPMTestSupport -import TSCBasic -import TSCUtility import XCTest class VersionSpecificTests: XCTestCase { diff --git a/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift b/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift index 479453355b3..fa6576b475e 100644 --- a/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift +++ b/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift @@ -9,12 +9,9 @@ */ import Dispatch -import Foundation -import XCTest - @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class CertificatePolicyTests: XCTestCase { func test_RSA_validate_happyCase() throws { diff --git a/Tests/PackageCollectionsSigningTests/CertificateTests.swift b/Tests/PackageCollectionsSigningTests/CertificateTests.swift index 5589fb2cd9c..35611fcf1cd 100644 --- a/Tests/PackageCollectionsSigningTests/CertificateTests.swift +++ b/Tests/PackageCollectionsSigningTests/CertificateTests.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class CertificateTests: XCTestCase { func test_withRSAKey_fromDER() throws { diff --git a/Tests/PackageCollectionsSigningTests/KeyTests+EC.swift b/Tests/PackageCollectionsSigningTests/KeyTests+EC.swift index 67f2a535e5d..c43bd9c57db 100644 --- a/Tests/PackageCollectionsSigningTests/KeyTests+EC.swift +++ b/Tests/PackageCollectionsSigningTests/KeyTests+EC.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class ECKeyTests: XCTestCase { func testPublicKeyFromCertificate() throws { diff --git a/Tests/PackageCollectionsSigningTests/KeyTests+RSA.swift b/Tests/PackageCollectionsSigningTests/KeyTests+RSA.swift index 468ad50584b..d816f509af7 100644 --- a/Tests/PackageCollectionsSigningTests/KeyTests+RSA.swift +++ b/Tests/PackageCollectionsSigningTests/KeyTests+RSA.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class RSAKeyTests: XCTestCase { func testPublicKeyFromCertificate() throws { diff --git a/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTest.swift b/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTest.swift index 6a095959704..ea091e9d222 100644 --- a/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTest.swift +++ b/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTest.swift @@ -9,13 +9,10 @@ */ import Dispatch -import Foundation -import XCTest - import PackageCollectionsModel @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class PackageCollectionSigningTests: XCTestCase { func test_RSA_signAndValidate_happyCase() throws { diff --git a/Tests/PackageCollectionsSigningTests/SignatureTests.swift b/Tests/PackageCollectionsSigningTests/SignatureTests.swift index 523abe15faf..83f38643958 100644 --- a/Tests/PackageCollectionsSigningTests/SignatureTests.swift +++ b/Tests/PackageCollectionsSigningTests/SignatureTests.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - @testable import PackageCollectionsSigning import SPMTestSupport -import TSCBasic +import XCTest class SignatureTests: XCTestCase { func test_RS256_generateAndValidate_happyCase() throws { diff --git a/Tests/PackageCollectionsSigningTests/Utilities.swift b/Tests/PackageCollectionsSigningTests/Utilities.swift index 630c08fbcea..97cfba43352 100644 --- a/Tests/PackageCollectionsSigningTests/Utilities.swift +++ b/Tests/PackageCollectionsSigningTests/Utilities.swift @@ -8,12 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import Dispatch import Foundation -import XCTest - @testable import PackageCollectionsSigning -import TSCBasic +import XCTest // Set `REAL_CERT_USER_ID` env var when running ENABLE_REAL_CERT_TEST tests let expectedSubjectUserID = ProcessInfo.processInfo.environment["REAL_CERT_USER_ID"] ?? "" diff --git a/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift b/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift index 3df07494215..0ef663b84be 100644 --- a/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift +++ b/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift @@ -8,16 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - -import Basics @testable import PackageCollections import PackageModel import SourceControl import SPMTestSupport -import TSCBasic import TSCUtility +import XCTest class GitHubPackageMetadataProviderTests: XCTestCase { func testBaseURL() throws { diff --git a/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift b/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift index 1d516c6a0a7..dbf298d7922 100644 --- a/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift +++ b/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift @@ -8,17 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - -import Basics @testable import PackageCollections import PackageCollectionsSigning import PackageModel import SourceControl import SPMTestSupport -import TSCBasic -import TSCUtility +import XCTest class JSONPackageCollectionProviderTests: XCTestCase { func testGood() throws { diff --git a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift index 62b7da6f3a2..4ae9225c286 100644 --- a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift +++ b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift @@ -9,8 +9,7 @@ */ @testable import PackageCollections -import TSCBasic -import TSCTestSupport +import SPMTestSupport import XCTest final class PackageCollectionsSourcesStorageTest: XCTestCase { diff --git a/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift b/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift index 64abe399eda..3065853a5ce 100644 --- a/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift +++ b/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift @@ -9,8 +9,7 @@ */ @testable import PackageCollections -import TSCBasic -import TSCTestSupport +import SPMTestSupport import XCTest class PackageCollectionsStorageTests: XCTestCase { diff --git a/Tests/PackageCollectionsTests/PackageCollectionsTests.swift b/Tests/PackageCollectionsTests/PackageCollectionsTests.swift index 397c24922d4..672c7712ec7 100644 --- a/Tests/PackageCollectionsTests/PackageCollectionsTests.swift +++ b/Tests/PackageCollectionsTests/PackageCollectionsTests.swift @@ -8,15 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Foundation -import XCTest - import Basics +import Foundation @testable import PackageCollections import PackageModel import SourceControl -import TSCBasic import TSCUtility +import XCTest final class PackageCollectionsTests: XCTestCase { func testUpdateAuthTokens() throws { diff --git a/Tests/PackageCollectionsTests/TrieTests.swift b/Tests/PackageCollectionsTests/TrieTests.swift index bf3e7ec3367..dc5ef161195 100644 --- a/Tests/PackageCollectionsTests/TrieTests.swift +++ b/Tests/PackageCollectionsTests/TrieTests.swift @@ -6,7 +6,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import XCTest @testable import PackageCollections diff --git a/Tests/PackageCollectionsTests/Utility.swift b/Tests/PackageCollectionsTests/Utility.swift index 6bbb08d2efd..eb00b28cad3 100644 --- a/Tests/PackageCollectionsTests/Utility.swift +++ b/Tests/PackageCollectionsTests/Utility.swift @@ -8,16 +8,15 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import struct Foundation.Date import struct Foundation.URL import struct Foundation.UUID - @testable import PackageCollections import PackageCollectionsModel import PackageCollectionsSigning import PackageModel import SourceControl -import TSCBasic import TSCUtility func makeMockSources(count: Int = Int.random(in: 5 ... 10)) -> [PackageCollectionsModel.CollectionSource] { diff --git a/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift b/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift index 1553ffa4cc1..d33fbbb53e0 100644 --- a/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift +++ b/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift @@ -8,17 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - import PackageGraph import PackageLoading import PackageModel import SourceControl -import TSCBasic - -import struct TSCUtility.Version - import SPMTestSupport +import XCTest private let v1: Version = "1.0.0" private let v1Range: VersionSetSpecifier = .range("1.0.0" ..< "2.0.0") diff --git a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift index ade7340d03f..ccccb17a048 100644 --- a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift +++ b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift @@ -8,13 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import PackageGraph -import PackageModel import PackageLoading +import PackageModel import SPMTestSupport +import XCTest class PackageGraphPerfTests: XCTestCasePerf { diff --git a/Tests/PackageGraphTests/DependencyResolverTests.swift b/Tests/PackageGraphTests/DependencyResolverTests.swift index bf905733129..4f6355895c6 100644 --- a/Tests/PackageGraphTests/DependencyResolverTests.swift +++ b/Tests/PackageGraphTests/DependencyResolverTests.swift @@ -8,17 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import PackageGraph +import PackageModel import SourceControl - -import struct TSCUtility.Version - import SPMTestSupport - -import PackageModel +import XCTest private typealias MockPackageConstraint = PackageContainerConstraint diff --git a/Tests/PackageGraphTests/PackageGraphTests.swift b/Tests/PackageGraphTests/PackageGraphTests.swift index 9a3d171affd..8cb8af84c48 100644 --- a/Tests/PackageGraphTests/PackageGraphTests.swift +++ b/Tests/PackageGraphTests/PackageGraphTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import PackageGraph import PackageModel import SPMTestSupport +import XCTest class PackageGraphTests: XCTestCase { diff --git a/Tests/PackageGraphTests/PubgrubTests.swift b/Tests/PackageGraphTests/PubgrubTests.swift index 29c7dec57e4..f9299c1226f 100644 --- a/Tests/PackageGraphTests/PubgrubTests.swift +++ b/Tests/PackageGraphTests/PubgrubTests.swift @@ -8,15 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic +import Basics import PackageLoading @testable import PackageModel @testable import PackageGraph import SourceControl - - +import XCTest // There's some useful helper utilities defined below for easier testing: // diff --git a/Tests/PackageGraphTests/RepositoryPackageContainerProviderTests.swift b/Tests/PackageGraphTests/RepositoryPackageContainerProviderTests.swift index cc71103e54e..bb276387215 100644 --- a/Tests/PackageGraphTests/RepositoryPackageContainerProviderTests.swift +++ b/Tests/PackageGraphTests/RepositoryPackageContainerProviderTests.swift @@ -8,17 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import Basics @testable import PackageGraph import PackageLoading import PackageModel import SourceControl -import TSCBasic -import TSCUtility - import SPMTestSupport +import XCTest private class MockRepository: Repository { /// The fake URL of the repository. diff --git a/Tests/PackageGraphTests/TargetTests.swift b/Tests/PackageGraphTests/TargetTests.swift index acd6199170a..8db179257f4 100644 --- a/Tests/PackageGraphTests/TargetTests.swift +++ b/Tests/PackageGraphTests/TargetTests.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import TSCBasic - +import Basics import PackageGraph import PackageModel +import XCTest private extension ResolvedTarget { convenience init(name: String, deps: ResolvedTarget...) { diff --git a/Tests/PackageLoadingPerformanceTests/ManifestLoadingTests.swift b/Tests/PackageLoadingPerformanceTests/ManifestLoadingTests.swift index e67798c353d..7820b4c3342 100644 --- a/Tests/PackageLoadingPerformanceTests/ManifestLoadingTests.swift +++ b/Tests/PackageLoadingPerformanceTests/ManifestLoadingTests.swift @@ -8,11 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import SPMTestSupport import PackageLoading +import SPMTestSupport +import XCTest class ManifestLoadingPerfTests: XCTestCasePerf { let manifestLoader = ManifestLoader(manifestResources: Resources.default) diff --git a/Tests/PackageLoadingTests/ManifestLoaderSQLiteCacheTests.swift b/Tests/PackageLoadingTests/ManifestLoaderSQLiteCacheTests.swift index e0a6740ef3e..f0fbad39bce 100644 --- a/Tests/PackageLoadingTests/ManifestLoaderSQLiteCacheTests.swift +++ b/Tests/PackageLoadingTests/ManifestLoaderSQLiteCacheTests.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Basics @testable import PackageLoading import PackageModel -import TSCBasic -import TSCTestSupport -import TSCUtility +import SPMTestSupport import XCTest class ManifestLoaderSQLiteCacheTests: XCTestCase { diff --git a/Tests/PackageLoadingTests/MinimumDeploymentTargetTests.swift b/Tests/PackageLoadingTests/MinimumDeploymentTargetTests.swift index 8266002c65e..9ba9222e1c0 100644 --- a/Tests/PackageLoadingTests/MinimumDeploymentTargetTests.swift +++ b/Tests/PackageLoadingTests/MinimumDeploymentTargetTests.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import XCTest - +import Basics @testable import PackageLoading +import XCTest class MinimumDeploymentTargetTests: XCTestCase { #if os(macOS) // these tests eventually call `xcrun`. diff --git a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift index 5502f655b35..c2834033a52 100644 --- a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift +++ b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import SPMTestSupport -import PackageModel import PackageLoading +import PackageModel +import SPMTestSupport +import XCTest class ModuleMapGeneration: XCTestCase { diff --git a/Tests/PackageLoadingTests/PD4_0LoadingTests.swift b/Tests/PackageLoadingTests/PD4_0LoadingTests.swift index 22fa24f9c87..d4ccf148b28 100644 --- a/Tests/PackageLoadingTests/PD4_0LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD4_0LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility import PackageModel -import SPMTestSupport import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription4_0LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PD4_2LoadingTests.swift b/Tests/PackageLoadingTests/PD4_2LoadingTests.swift index 4368aa3b47c..19cfcedb4dd 100644 --- a/Tests/PackageLoadingTests/PD4_2LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD4_2LoadingTests.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import Basics import PackageModel import PackageLoading import SPMTestSupport -import TSCBasic -import TSCUtility import XCTest class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests { diff --git a/Tests/PackageLoadingTests/PD5_0LoadingTests.swift b/Tests/PackageLoadingTests/PD5_0LoadingTests.swift index 00693117355..b55d723bffb 100644 --- a/Tests/PackageLoadingTests/PD5_0LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD5_0LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription5_0LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PD5_2LoadingTests.swift b/Tests/PackageLoadingTests/PD5_2LoadingTests.swift index cee3255c8f1..07fb72ac243 100644 --- a/Tests/PackageLoadingTests/PD5_2LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD5_2LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription5_2LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PD5_3LoadingTests.swift b/Tests/PackageLoadingTests/PD5_3LoadingTests.swift index d4d0f043b5a..452cd739be2 100644 --- a/Tests/PackageLoadingTests/PD5_3LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD5_3LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription5_3LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PD5_4LoadingTests.swift b/Tests/PackageLoadingTests/PD5_4LoadingTests.swift index dbd787b908a..141ec7c45a1 100644 --- a/Tests/PackageLoadingTests/PD5_4LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD5_4LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription5_4LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PD5_5LoadingTests.swift b/Tests/PackageLoadingTests/PD5_5LoadingTests.swift index fc7e4d4d6a1..0bcf546a6e7 100644 --- a/Tests/PackageLoadingTests/PD5_5LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD5_5LoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescription5_5LoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PDLoadingTests.swift b/Tests/PackageLoadingTests/PDLoadingTests.swift index a6582bbae74..5653c9568c1 100644 --- a/Tests/PackageLoadingTests/PDLoadingTests.swift +++ b/Tests/PackageLoadingTests/PDLoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescriptionLoadingTests: XCTestCase { let manifestLoader = ManifestLoader(manifestResources: Resources.default) diff --git a/Tests/PackageLoadingTests/PDNextVersionLoadingTests.swift b/Tests/PackageLoadingTests/PDNextVersionLoadingTests.swift index 6242ae7fbfa..7ffd0cf3843 100644 --- a/Tests/PackageLoadingTests/PDNextVersionLoadingTests.swift +++ b/Tests/PackageLoadingTests/PDNextVersionLoadingTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import SPMTestSupport import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class PackageDescriptionNextVersionLoadingTests: PackageDescriptionLoadingTests { override var toolsVersion: ToolsVersion { diff --git a/Tests/PackageLoadingTests/PackageBuilderTests.swift b/Tests/PackageLoadingTests/PackageBuilderTests.swift index e9435b180e4..efd897c3161 100644 --- a/Tests/PackageLoadingTests/PackageBuilderTests.swift +++ b/Tests/PackageLoadingTests/PackageBuilderTests.swift @@ -8,14 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import SPMTestSupport - -import TSCBasic -import PackageModel -import TSCUtility - import PackageLoading +import PackageModel +import SPMTestSupport +import XCTest /// Tests for the handling of source layout conventions. class PackageBuilderTests: XCTestCase { diff --git a/Tests/PackageLoadingTests/PkgConfigTests.swift b/Tests/PackageLoadingTests/PkgConfigTests.swift index 2f5212f7b5d..72b3f4be817 100644 --- a/Tests/PackageLoadingTests/PkgConfigTests.swift +++ b/Tests/PackageLoadingTests/PkgConfigTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import PackageModel import PackageLoading -import TSCUtility import SPMTestSupport +import XCTest extension SystemLibraryTarget { convenience init(pkgConfig: String, providers: [SystemPackageProviderDescription] = []) { diff --git a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift index 91d1f84d0e2..84a182a4c2b 100644 --- a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift +++ b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift @@ -8,12 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import SPMTestSupport - -import TSCBasic import PackageModel import PackageLoading +import SPMTestSupport +import XCTest class TargetSourcesBuilderTests: XCTestCase { func testBasicFileContentsComputation() throws { diff --git a/Tests/PackageLoadingTests/ToolsVersionLoaderTests.swift b/Tests/PackageLoadingTests/ToolsVersionLoaderTests.swift index f4c18dd7d6b..d5c5a89e038 100644 --- a/Tests/PackageLoadingTests/ToolsVersionLoaderTests.swift +++ b/Tests/PackageLoadingTests/ToolsVersionLoaderTests.swift @@ -8,13 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ - -import Basics import PackageModel import PackageLoading import SPMTestSupport -import TSCBasic -import TSCUtility import XCTest class ToolsVersionLoaderTests: XCTestCase { diff --git a/Tests/PackageModelTests/CanonicalPackageIdentityTests.swift b/Tests/PackageModelTests/CanonicalPackageIdentityTests.swift index cda57eea21e..0701d774b5f 100644 --- a/Tests/PackageModelTests/CanonicalPackageIdentityTests.swift +++ b/Tests/PackageModelTests/CanonicalPackageIdentityTests.swift @@ -10,8 +10,6 @@ import XCTest -import TSCBasic - @testable import PackageModel final class CanonicalPackageIdentityTests: XCTestCase { diff --git a/Tests/PackageModelTests/LegacyPackageIdentityTests.swift b/Tests/PackageModelTests/LegacyPackageIdentityTests.swift index 0cf0d40752a..22a69d52864 100644 --- a/Tests/PackageModelTests/LegacyPackageIdentityTests.swift +++ b/Tests/PackageModelTests/LegacyPackageIdentityTests.swift @@ -10,8 +10,6 @@ import XCTest -import TSCBasic - @testable import PackageModel final class LegacyPackageIdentityTests: XCTestCase { diff --git a/Tests/PackageModelTests/PackageModelTests.swift b/Tests/PackageModelTests/PackageModelTests.swift index 9a28ed23116..2a6858bcf5b 100644 --- a/Tests/PackageModelTests/PackageModelTests.swift +++ b/Tests/PackageModelTests/PackageModelTests.swift @@ -8,10 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest import Basics -import TSCBasic import PackageModel +import XCTest class PackageModelTests: XCTestCase { diff --git a/Tests/PackageModelTests/SwiftLanguageVersionTests.swift b/Tests/PackageModelTests/SwiftLanguageVersionTests.swift index 806c98b120d..dd26723e7c1 100644 --- a/Tests/PackageModelTests/SwiftLanguageVersionTests.swift +++ b/Tests/PackageModelTests/SwiftLanguageVersionTests.swift @@ -8,11 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic - import PackageModel +import XCTest class SwiftLanguageVersionTests: XCTestCase { diff --git a/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift b/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift index f99b1efc3e0..5381b829594 100644 --- a/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift +++ b/Tests/SPMBuildCoreTests/ArtifactsArchiveMetadataTests.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import SPMBuildCore -import TSCBasic import TSCUtility import XCTest diff --git a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift index ffb1be84ce6..a743e09bd21 100644 --- a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift +++ b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift @@ -8,15 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import TSCBasic -import TSCUtility - import PackageGraph import PackageModel @testable import SPMBuildCore import SPMTestSupport - +import XCTest class PluginInvocationTests: XCTestCase { diff --git a/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift b/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift index 4d2f64b4659..6219bd4845d 100644 --- a/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift +++ b/Tests/SPMBuildCoreTests/XCFrameworkMetadataTests.swift @@ -8,8 +8,8 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ +import Basics import SPMBuildCore -import TSCBasic import XCTest final class XCFrameworkMetadataTests: XCTestCase { diff --git a/Tests/SPMPackageEditorTests/PackageEditorTests.swift b/Tests/SPMPackageEditorTests/PackageEditorTests.swift index 5524479b9a9..bd5eb183bd3 100644 --- a/Tests/SPMPackageEditorTests/PackageEditorTests.swift +++ b/Tests/SPMPackageEditorTests/PackageEditorTests.swift @@ -8,11 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import TSCBasic -import SPMTestSupport - @testable import SPMPackageEditor +import SPMTestSupport +import XCTest final class PackageEditorTests: XCTestCase { func testAddTarget() throws { diff --git a/Tests/SourceControlTests/GitRepositoryTests.swift b/Tests/SourceControlTests/GitRepositoryTests.swift index be3173250f5..170772f069c 100644 --- a/Tests/SourceControlTests/GitRepositoryTests.swift +++ b/Tests/SourceControlTests/GitRepositoryTests.swift @@ -8,13 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic @testable import SourceControl -import TSCUtility - import SPMTestSupport +import XCTest class GitRepositoryTests: XCTestCase { /// Test the basic provider functions. diff --git a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift index a543deeb037..96d92a1c32b 100644 --- a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift +++ b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift @@ -8,13 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import SourceControl -import TSCUtility - import SPMTestSupport +import XCTest class InMemoryGitRepositoryTests: XCTestCase { func testBasics() throws { diff --git a/Tests/SourceControlTests/RepositoryManagerTests.swift b/Tests/SourceControlTests/RepositoryManagerTests.swift index ab8f6187eab..d82e7f23165 100644 --- a/Tests/SourceControlTests/RepositoryManagerTests.swift +++ b/Tests/SourceControlTests/RepositoryManagerTests.swift @@ -8,12 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - @testable import SourceControl -import TSCBasic - import SPMTestSupport +import XCTest private enum DummyError: Swift.Error { case invalidRepository diff --git a/Tests/WorkspaceTests/InitTests.swift b/Tests/WorkspaceTests/InitTests.swift index 6aa4faffed9..677122861bd 100644 --- a/Tests/WorkspaceTests/InitTests.swift +++ b/Tests/WorkspaceTests/InitTests.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import SPMTestSupport -import TSCBasic import PackageModel +import SPMTestSupport import Workspace +import XCTest class InitTests: XCTestCase { diff --git a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift index 90a7f2874c5..b52abb5ea4c 100644 --- a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift +++ b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import SPMTestSupport -import TSCBasic import PackageModel import Workspace +import SPMTestSupport +import XCTest class ManifestSourceGenerationTests: XCTestCase { diff --git a/Tests/WorkspaceTests/PinsStoreTests.swift b/Tests/WorkspaceTests/PinsStoreTests.swift index 66fe2cf8031..c5263578744 100644 --- a/Tests/WorkspaceTests/PinsStoreTests.swift +++ b/Tests/WorkspaceTests/PinsStoreTests.swift @@ -8,15 +8,12 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility -import PackageModel import PackageGraph +import PackageModel import SPMTestSupport import SourceControl import Workspace +import XCTest final class PinsStoreTests: XCTestCase { diff --git a/Tests/WorkspaceTests/ToolsVersionWriterTests.swift b/Tests/WorkspaceTests/ToolsVersionWriterTests.swift index f06cf3e27f8..83d597ba0bd 100644 --- a/Tests/WorkspaceTests/ToolsVersionWriterTests.swift +++ b/Tests/WorkspaceTests/ToolsVersionWriterTests.swift @@ -8,11 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic +import Basics import PackageModel import Workspace +import XCTest class ToolsVersionWriterTests: XCTestCase { diff --git a/Tests/WorkspaceTests/WorkspaceConfigurationTests.swift b/Tests/WorkspaceTests/WorkspaceConfigurationTests.swift index 9d538bb1dbd..e0476576866 100644 --- a/Tests/WorkspaceTests/WorkspaceConfigurationTests.swift +++ b/Tests/WorkspaceTests/WorkspaceConfigurationTests.swift @@ -8,13 +8,9 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import TSCUtility import SPMTestSupport - import Workspace +import XCTest final class WorkspaceConfigurationTests: XCTestCase { func testLoadingSchema1() throws { diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift index f4c0902999d..a38b3f0b38a 100644 --- a/Tests/WorkspaceTests/WorkspaceTests.swift +++ b/Tests/WorkspaceTests/WorkspaceTests.swift @@ -8,19 +8,14 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - import PackageGraph import PackageLoading import PackageModel import SourceControl import SPMBuildCore -import TSCBasic -import TSCUtility -import Workspace -import Basics - import SPMTestSupport +import Workspace +import XCTest final class WorkspaceTests: XCTestCase { func testBasics() throws { diff --git a/Tests/XCBuildSupportTests/PIFBuilderTests.swift b/Tests/XCBuildSupportTests/PIFBuilderTests.swift index fe3f84487eb..9116ecfff06 100644 --- a/Tests/XCBuildSupportTests/PIFBuilderTests.swift +++ b/Tests/XCBuildSupportTests/PIFBuilderTests.swift @@ -8,16 +8,13 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import TSCBasic -import TSCUtility -import PackageModel import PackageGraph +@testable import PackageLoading +import PackageModel import SPMBuildCore -import XCBuildSupport import SPMTestSupport - -@testable import PackageLoading +import XCBuildSupport +import XCTest class PIFBuilderTests: XCTestCase { let inputsDir = AbsolutePath(#file).parentDirectory.appending(components: "Inputs") diff --git a/Tests/XCBuildSupportTests/PIFTests.swift b/Tests/XCBuildSupportTests/PIFTests.swift index 137af77948f..682afccbe0d 100644 --- a/Tests/XCBuildSupportTests/PIFTests.swift +++ b/Tests/XCBuildSupportTests/PIFTests.swift @@ -8,14 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest -import Basics -import TSCBasic -import TSCUtility import PackageModel import SPMBuildCore -import XCBuildSupport import SPMTestSupport +import XCBuildSupport +import XCTest class PIFTests: XCTestCase { let topLevelObject = PIF.TopLevelObject(workspace: diff --git a/Tests/XcodeprojTests/FunctionalTests.swift b/Tests/XcodeprojTests/FunctionalTests.swift index f2f5cf3868f..f90d35498e6 100644 --- a/Tests/XcodeprojTests/FunctionalTests.swift +++ b/Tests/XcodeprojTests/FunctionalTests.swift @@ -8,13 +8,10 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic -import SPMTestSupport import PackageModel -import TSCUtility +import SPMTestSupport import Xcodeproj +import XCTest class FunctionalTests: XCTestCase { func testSingleModuleLibrary() { diff --git a/Tests/XcodeprojTests/GenerateXcodeprojTests.swift b/Tests/XcodeprojTests/GenerateXcodeprojTests.swift index ee922dfb403..1000986fb80 100644 --- a/Tests/XcodeprojTests/GenerateXcodeprojTests.swift +++ b/Tests/XcodeprojTests/GenerateXcodeprojTests.swift @@ -8,13 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic -import SPMTestSupport import PackageGraph import PackageModel import SourceControl +import SPMTestSupport import Xcodeproj -import TSCUtility import XCTest class GenerateXcodeprojTests: XCTestCase { diff --git a/Tests/XcodeprojTests/PackageGraphTests.swift b/Tests/XcodeprojTests/PackageGraphTests.swift index 909601f4dc6..6cdbff9beb2 100644 --- a/Tests/XcodeprojTests/PackageGraphTests.swift +++ b/Tests/XcodeprojTests/PackageGraphTests.swift @@ -8,13 +8,11 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import XCTest - -import TSCBasic import PackageGraph import SPMTestSupport import PackageModel import Xcodeproj +import XCTest class PackageGraphTests: XCTestCase { func testBasics() throws { diff --git a/Tests/XcodeprojTests/XcodeProjectModelSerializationTests.swift b/Tests/XcodeprojTests/XcodeProjectModelSerializationTests.swift index 2016e9641ff..55f86194647 100644 --- a/Tests/XcodeprojTests/XcodeProjectModelSerializationTests.swift +++ b/Tests/XcodeprojTests/XcodeProjectModelSerializationTests.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import SPMTestSupport import Xcodeproj import XCTest diff --git a/Tests/XcodeprojTests/XcodeProjectModelTests.swift b/Tests/XcodeprojTests/XcodeProjectModelTests.swift index 897e0685a35..87bd139b9a3 100644 --- a/Tests/XcodeprojTests/XcodeProjectModelTests.swift +++ b/Tests/XcodeprojTests/XcodeProjectModelTests.swift @@ -8,7 +8,6 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors */ -import TSCBasic import SPMTestSupport import Xcodeproj import XCTest diff --git a/Utilities/Docker/docker-compose.yaml b/Utilities/Docker/docker-compose.yaml index e70fb344767..60bda8721b4 100644 --- a/Utilities/Docker/docker-compose.yaml +++ b/Utilities/Docker/docker-compose.yaml @@ -36,6 +36,7 @@ services: - ../../../swift-argument-parser:/code/swift-argument-parser:z - ../../../swift-driver:/code/swift-driver:z - ../../../swift-crypto:/code/swift-crypto:z + - ../../../swift-collections:/code/swift-collections:z - ../../../swift-llbuild:/code/llbuild:z working_dir: /code/swift-package-manager cap_drop: diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 59d9b99fda4..177ae2f667a 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -174,6 +174,7 @@ def parse_global_args(args): args.swift_argument_parser_source_dir = os.path.join(args.project_root, "..", "swift-argument-parser") args.swift_driver_source_dir = os.path.join(args.project_root, "..", "swift-driver") args.swift_crypto_source_dir = os.path.join(args.project_root, "..", "swift-crypto") + args.swift_collections_source_dir = os.path.join(args.project_root, "..", "swift-collections") args.source_root = os.path.join(args.project_root, "Sources") if platform.system() == 'Darwin': @@ -322,6 +323,7 @@ def build(args): build_swift_argument_parser(args) build_swift_driver(args) build_swift_crypto(args) + build_swift_collections(args) build_swiftpm_with_cmake(args) build_swiftpm_with_swiftpm(args,integrated_swift_driver=False) @@ -561,7 +563,7 @@ def build_swift_driver(args): cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target) build_with_cmake(args, cmake_flags, args.swift_driver_source_dir, args.swift_driver_build_dir) - + def build_swift_crypto(args): note("Building SwiftCrypto") args.swift_crypto_build_dir = os.path.join(args.target_dir, "swift-crypto") @@ -573,6 +575,17 @@ def build_swift_crypto(args): build_with_cmake(args, cmake_flags, args.swift_crypto_source_dir, args.swift_crypto_build_dir) +def build_swift_collections(args): + note("Building SwiftCollctions") + args.swift_collections_build_dir = os.path.join(args.target_dir, "swift-collections") + + cmake_flags = [] + if platform.system() == 'Darwin': + cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target)) + cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target) + + build_with_cmake(args, cmake_flags, args.swift_collections_source_dir, args.swift_collections_build_dir) + def add_rpath_for_cmake_build(args, rpath): "Adds the given rpath to the CMake-built swift-build" swift_build = os.path.join(args.bootstrap_dir, "bin/swift-build") @@ -591,6 +604,7 @@ def build_swiftpm_with_cmake(args): "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"), "-DSwiftDriver_DIR=" + os.path.join(args.swift_driver_build_dir, "cmake/modules"), "-DSwiftCrypto_DIR=" + os.path.join(args.swift_crypto_build_dir, "cmake/modules"), + "-DSwiftCollections_DIR=" + os.path.join(args.swift_collections_build_dir, "cmake/modules"), ] if platform.system() == 'Darwin': @@ -607,6 +621,7 @@ def build_swiftpm_with_cmake(args): add_rpath_for_cmake_build(args, os.path.join(args.swift_argument_parser_build_dir, "lib")) add_rpath_for_cmake_build(args, os.path.join(args.swift_driver_build_dir, "lib")) add_rpath_for_cmake_build(args, os.path.join(args.swift_crypto_build_dir, "lib")) + add_rpath_for_cmake_build(args, os.path.join(args.swift_collections_build_dir, "lib")) def build_swiftpm_with_swiftpm(args, integrated_swift_driver): """Builds SwiftPM using the version of SwiftPM built with CMake.""" @@ -705,6 +720,7 @@ def get_swiftpm_env_cmd(args): os.path.join(args.swift_argument_parser_build_dir, "lib"), os.path.join(args.swift_driver_build_dir, "lib"), os.path.join(args.swift_crypto_build_dir, "lib"), + os.path.join(args.swift_collections_build_dir, "lib"), ] + args.target_info["paths"]["runtimeLibraryPaths"]) if platform.system() == 'Darwin':