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.