adopt swift-collections

motivation: replace TSC versions of ordered collections with the new ones from swift-collections

changes:
* pull in swift-collections as a dependency
* update bootstrap script
* adapt callsites to swift-collections
* reduce redundant imports, especially in tests across Basics, TSCBasic, TSCUtilities and SPMTestSupport

Author: tomerd

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,12 +359,14 @@ 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 += [
         .package(path: "../swift-tools-support-core"),
         .package(path: "../swift-argument-parser"),
         .package(path: "../swift-driver"),
         .package(path: "../swift-crypto"),
+        .package(path: "../swift-collections"),
     ]
 }

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.

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

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<Key, Value> where Key: Hashable {

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

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

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

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

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)

Sources/Basics/SQLiteBackedCache.swift

@@ -9,8 +9,6 @@
  */
 
 import Foundation
-
-import TSCBasic
 import TSCUtility
 
 /// SQLite backed persistent cache.

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 {

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 {

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

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 {

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 {

Sources/Build/SPMSwiftDriverExecutor.swift

@@ -9,7 +9,6 @@
 */
 
 import Basics
-import TSCBasic
 import Foundation
 @_implementationOnly import SwiftDriver
 

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.

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.

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).

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 {

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.
 ///

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.
 ///

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),

Sources/Commands/SwiftBuildTool.swift

@@ -13,7 +13,6 @@ import Basics
 import Build
 import PackageGraph
 import SPMBuildCore
-import TSCBasic
 import TSCUtility
 
 extension BuildSubset {

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 {

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 {

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.

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 {