Revert "Adopt package in the test support module (#7372)"

This reverts commit b9fc53b.

Author: xedin

Sources/SPMTestSupport/InMemoryGitRepository.swift

@@ -17,7 +17,7 @@ import PackageModel
 import struct TSCUtility.Version
 
 extension Manifest {
-    package static func createRootManifest(
+    public static func createRootManifest(
         displayName: String,
         path: AbsolutePath = .root,
         defaultLocalization: String? = nil,
@@ -53,7 +53,7 @@ extension Manifest {
         )
     }
 
-    package static func createFileSystemManifest(
+    public static func createFileSystemManifest(
         displayName: String,
         path: AbsolutePath,
         defaultLocalization: String? = nil,
@@ -89,7 +89,7 @@ extension Manifest {
         )
     }
 
-    package static func createLocalSourceControlManifest(
+    public static func createLocalSourceControlManifest(
         displayName: String,
         path: AbsolutePath,
         defaultLocalization: String? = nil,
@@ -125,7 +125,7 @@ extension Manifest {
         )
     }
 
-    package static func createRemoteSourceControlManifest(
+    public static func createRemoteSourceControlManifest(
         displayName: String,
         url: SourceControlURL,
         path: AbsolutePath,
@@ -162,7 +162,7 @@ extension Manifest {
         )
     }
 
-    package static func createRegistryManifest(
+    public static func createRegistryManifest(
         displayName: String,
         identity: PackageIdentity,
         path: AbsolutePath = .root,
@@ -199,7 +199,7 @@ extension Manifest {
         )
     }
 
-    package static func createManifest(
+    public static func createManifest(
         displayName: String,
         path: AbsolutePath = .root,
         packageKind: PackageReference.Kind,
@@ -238,7 +238,7 @@ extension Manifest {
         )
     }
 
-    package func with(location: String) -> Manifest {
+    public func with(location: String) -> Manifest {
         Manifest(
             displayName: self.displayName,
             path: self.path,

Sources/SPMTestSupport/ManifestExtensions.swift

@@ -28,20 +28,20 @@ package final class MockArchiver: Archiver {
     package typealias ValidationHandler = (MockArchiver, AbsolutePath, (Result<Bool, Error>) -> Void) throws -> Void
 
     package struct Extraction: Equatable {
-        package let archivePath: AbsolutePath
-        package let destinationPath: AbsolutePath
+        public let archivePath: AbsolutePath
+        public let destinationPath: AbsolutePath
 
-        package init(archivePath: AbsolutePath, destinationPath: AbsolutePath) {
+        public init(archivePath: AbsolutePath, destinationPath: AbsolutePath) {
             self.archivePath = archivePath
             self.destinationPath = destinationPath
         }
     }
 
     package struct Compression: Equatable {
-        package let directory: AbsolutePath
-        package let destinationPath: AbsolutePath
+        public let directory: AbsolutePath
+        public let destinationPath: AbsolutePath
 
-        package init(directory: AbsolutePath, destinationPath: AbsolutePath) {
+        public init(directory: AbsolutePath, destinationPath: AbsolutePath) {
             self.directory = directory
             self.destinationPath = destinationPath
         }

Sources/SPMTestSupport/MockArchiver.swift

@@ -22,59 +22,59 @@ import SPMBuildCore
 import TSCUtility
 import XCTest
 
-package struct MockToolchain: PackageModel.Toolchain {
+public struct MockToolchain: PackageModel.Toolchain {
     #if os(Windows)
-    package let librarianPath = AbsolutePath("/fake/path/to/link.exe")
+    public let librarianPath = AbsolutePath("/fake/path/to/link.exe")
     #elseif os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
-    package let librarianPath = AbsolutePath("/fake/path/to/libtool")
+    public let librarianPath = AbsolutePath("/fake/path/to/libtool")
     #else
-    package let librarianPath = AbsolutePath("/fake/path/to/llvm-ar")
+    public let librarianPath = AbsolutePath("/fake/path/to/llvm-ar")
     #endif
-    package let swiftCompilerPath = AbsolutePath("/fake/path/to/swiftc")
-    package let includeSearchPaths = [AbsolutePath]()
-    package let librarySearchPaths = [AbsolutePath]()
-    package let swiftResourcesPath: AbsolutePath?
-    package let swiftStaticResourcesPath: AbsolutePath? = nil
-    package let sdkRootPath: AbsolutePath? = nil
-    package let extraFlags = PackageModel.BuildFlags()
-    package let installedSwiftPMConfiguration = InstalledSwiftPMConfiguration.default
-    package let providedLibraries = [ProvidedLibrary]()
-
-    package func getClangCompiler() throws -> AbsolutePath {
+    public let swiftCompilerPath = AbsolutePath("/fake/path/to/swiftc")
+    public let includeSearchPaths = [AbsolutePath]()
+    public let librarySearchPaths = [AbsolutePath]()
+    public let swiftResourcesPath: AbsolutePath?
+    public let swiftStaticResourcesPath: AbsolutePath? = nil
+    public let sdkRootPath: AbsolutePath? = nil
+    public let extraFlags = PackageModel.BuildFlags()
+    public let installedSwiftPMConfiguration = InstalledSwiftPMConfiguration.default
+    public let providedLibraries = [ProvidedLibrary]()
+
+    public func getClangCompiler() throws -> AbsolutePath {
         "/fake/path/to/clang"
     }
 
-    package func _isClangCompilerVendorApple() throws -> Bool? {
+    public func _isClangCompilerVendorApple() throws -> Bool? {
         #if os(macOS)
         return true
         #else
         return false
         #endif
     }
 
-    package init(swiftResourcesPath: AbsolutePath? = nil) {
+    public init(swiftResourcesPath: AbsolutePath? = nil) {
         self.swiftResourcesPath = swiftResourcesPath
     }
 }
 
 extension Basics.Triple {
-    package static let x86_64MacOS = try! Self("x86_64-apple-macosx")
-    package static let x86_64Linux = try! Self("x86_64-unknown-linux-gnu")
-    package static let arm64Linux = try! Self("aarch64-unknown-linux-gnu")
-    package static let arm64Android = try! Self("aarch64-unknown-linux-android")
-    package static let windows = try! Self("x86_64-unknown-windows-msvc")
-    package static let wasi = try! Self("wasm32-unknown-wasi")
-    package static let arm64iOS = try! Self("arm64-apple-ios")
+    public static let x86_64MacOS = try! Self("x86_64-apple-macosx")
+    public static let x86_64Linux = try! Self("x86_64-unknown-linux-gnu")
+    public static let arm64Linux = try! Self("aarch64-unknown-linux-gnu")
+    public static let arm64Android = try! Self("aarch64-unknown-linux-android")
+    public static let windows = try! Self("x86_64-unknown-windows-msvc")
+    public static let wasi = try! Self("wasm32-unknown-wasi")
+    public static let arm64iOS = try! Self("arm64-apple-ios")
 }
 
-package let hostTriple = try! UserToolchain.default.targetTriple
+public let hostTriple = try! UserToolchain.default.targetTriple
 #if os(macOS)
-package let defaultTargetTriple: String = hostTriple.tripleString(forPlatformVersion: "10.13")
+public let defaultTargetTriple: String = hostTriple.tripleString(forPlatformVersion: "10.13")
 #else
-package let defaultTargetTriple: String = hostTriple.tripleString
+public let defaultTargetTriple: String = hostTriple.tripleString
 #endif
 
-package func mockBuildParameters(
+public func mockBuildParameters(
     buildPath: AbsolutePath? = nil,
     config: BuildConfiguration = .debug,
     toolchain: PackageModel.Toolchain = MockToolchain(),
@@ -116,7 +116,7 @@ package func mockBuildParameters(
     )
 }
 
-package func mockBuildParameters(environment: BuildEnvironment) -> BuildParameters {
+public func mockBuildParameters(environment: BuildEnvironment) -> BuildParameters {
     let triple: Basics.Triple
     switch environment.platform {
     case .macOS:
@@ -138,12 +138,12 @@ enum BuildError: Swift.Error {
     case error(String)
 }
 
-package struct BuildPlanResult {
-    package let plan: Build.BuildPlan
-    package let targetMap: [ResolvedModule.ID: TargetBuildDescription]
-    package let productMap: [ResolvedProduct.ID: Build.ProductBuildDescription]
+public struct BuildPlanResult {
+    public let plan: Build.BuildPlan
+    public let targetMap: [ResolvedModule.ID: TargetBuildDescription]
+    public let productMap: [ResolvedProduct.ID: Build.ProductBuildDescription]
 
-    package init(plan: Build.BuildPlan) throws {
+    public init(plan: Build.BuildPlan) throws {
         self.plan = plan
         self.productMap = try Dictionary(
             throwingUniqueKeysWithValues: plan.buildProducts
@@ -163,15 +163,15 @@ package struct BuildPlanResult {
         )
     }
 
-    package func checkTargetsCount(_ count: Int, file: StaticString = #file, line: UInt = #line) {
+    public func checkTargetsCount(_ count: Int, file: StaticString = #file, line: UInt = #line) {
         XCTAssertEqual(self.plan.targetMap.count, count, file: file, line: line)
     }
 
-    package func checkProductsCount(_ count: Int, file: StaticString = #file, line: UInt = #line) {
+    public func checkProductsCount(_ count: Int, file: StaticString = #file, line: UInt = #line) {
         XCTAssertEqual(self.plan.productMap.count, count, file: file, line: line)
     }
 
-    package func target(for name: String) throws -> TargetBuildDescription {
+    public func target(for name: String) throws -> TargetBuildDescription {
         let matchingIDs = targetMap.keys.filter({ $0.targetName == name })
         guard matchingIDs.count == 1, let target = targetMap[matchingIDs[0]] else {
             if matchingIDs.isEmpty {
@@ -183,7 +183,7 @@ package struct BuildPlanResult {
         return target
     }
 
-    package func buildProduct(for name: String) throws -> Build.ProductBuildDescription {
+    public func buildProduct(for name: String) throws -> Build.ProductBuildDescription {
         let matchingIDs = productMap.keys.filter({ $0.productName == name })
         guard matchingIDs.count == 1, let product = productMap[matchingIDs[0]] else {
             if matchingIDs.isEmpty {
@@ -198,7 +198,7 @@ package struct BuildPlanResult {
 }
 
 extension TargetBuildDescription {
-    package func swiftTarget() throws -> SwiftTargetBuildDescription {
+    public func swiftTarget() throws -> SwiftTargetBuildDescription {
         switch self {
         case .swift(let target):
             return target
@@ -207,7 +207,7 @@ extension TargetBuildDescription {
         }
     }
 
-    package func clangTarget() throws -> ClangTargetBuildDescription {
+    public func clangTarget() throws -> ClangTargetBuildDescription {
         switch self {
         case .clang(let target):
             return target

Sources/SPMTestSupport/MockBuildTestHelper.swift

@@ -15,21 +15,21 @@ import Foundation
 import PackageLoading
 import PackageModel
 
-package typealias SourceControlRequirement = PackageDependency.SourceControl.Requirement
-package typealias RegistryRequirement = PackageDependency.Registry.Requirement
+public typealias SourceControlRequirement = PackageDependency.SourceControl.Requirement
+public typealias RegistryRequirement = PackageDependency.Registry.Requirement
 
-package struct MockDependency {
-    package let deprecatedName: String?
-    package let location: Location
-    package let products: ProductFilter
+public struct MockDependency {
+    public let deprecatedName: String?
+    public let location: Location
+    public let products: ProductFilter
 
     init(deprecatedName: String? = nil, location: Location, products: ProductFilter = .everything) {
         self.deprecatedName = deprecatedName
         self.location = location
         self.products = products
     }
 
-    package func convert(baseURL: AbsolutePath, identityResolver: IdentityResolver) throws -> PackageDependency {
+    public func convert(baseURL: AbsolutePath, identityResolver: IdentityResolver) throws -> PackageDependency {
         switch self.location {
         case .fileSystem(let path):
             let absolutePath = baseURL.appending(path)
@@ -119,39 +119,39 @@ package struct MockDependency {
 
     }
 
-    package static func fileSystem(path: String, products: ProductFilter = .everything) -> MockDependency {
+    public static func fileSystem(path: String, products: ProductFilter = .everything) -> MockDependency {
         try! MockDependency(location: .fileSystem(path: RelativePath(validating: path)), products: products)
     }
 
-    package static func sourceControl(path: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func sourceControl(path: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
         try! .sourceControl(path: RelativePath(validating: path), requirement: requirement, products: products)
     }
 
-    package static func sourceControl(path: RelativePath, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func sourceControl(path: RelativePath, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
         MockDependency(location: .localSourceControl(path: path, requirement: requirement), products: products)
     }
 
-    package static func sourceControlWithDeprecatedName(name: String, path: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func sourceControlWithDeprecatedName(name: String, path: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
         try! MockDependency(deprecatedName: name, location: .localSourceControl(path: RelativePath(validating: path), requirement: requirement), products: products)
     }
 
-    package static func sourceControl(url: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func sourceControl(url: String, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
         .sourceControl(url: SourceControlURL(url), requirement: requirement, products: products)
     }
 
-    package static func sourceControl(url: SourceControlURL, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func sourceControl(url: SourceControlURL, requirement: SourceControlRequirement, products: ProductFilter = .everything) -> MockDependency {
         MockDependency(location: .remoteSourceControl(url: url, requirement: requirement), products: products)
     }
 
-    package static func registry(identity: String, requirement: RegistryRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func registry(identity: String, requirement: RegistryRequirement, products: ProductFilter = .everything) -> MockDependency {
         .registry(identity: .plain(identity), requirement: requirement)
     }
 
-    package static func registry(identity: PackageIdentity, requirement: RegistryRequirement, products: ProductFilter = .everything) -> MockDependency {
+    public static func registry(identity: PackageIdentity, requirement: RegistryRequirement, products: ProductFilter = .everything) -> MockDependency {
         MockDependency(location: .registry(identity: identity, requirement: requirement), products: products)
     }
 
-    package enum Location {
+    public enum Location {
         case fileSystem(path: RelativePath)
         case localSourceControl(path: RelativePath, requirement: SourceControlRequirement)
         case remoteSourceControl(url: SourceControlURL, requirement: SourceControlRequirement)

Sources/SPMTestSupport/MockDependency.swift

@@ -16,20 +16,20 @@ import PackageModel
 
 import struct TSCUtility.Version
 
-package struct MockDependencyGraph {
-    package let name: String
-    package let constraints: [MockPackageContainer.Constraint]
-    package let containers: [MockPackageContainer]
-    package let result: [PackageReference: Version]
+public struct MockDependencyGraph {
+    public let name: String
+    public let constraints: [MockPackageContainer.Constraint]
+    public let containers: [MockPackageContainer]
+    public let result: [PackageReference: Version]
 
-    package init(name: String, constraints: [MockPackageContainer.Constraint], containers: [MockPackageContainer], result: [PackageReference : Version]) {
+    public init(name: String, constraints: [MockPackageContainer.Constraint], containers: [MockPackageContainer], result: [PackageReference : Version]) {
         self.name = name
         self.constraints = constraints
         self.containers = containers
         self.result = result
     }
 
-    package func checkResult(
+    public func checkResult(
         _ output: [(container: PackageReference, version: Version)],
         file: StaticString = #file,
         line: UInt = #line

Sources/SPMTestSupport/MockDependencyGraph.swift

@@ -13,7 +13,7 @@
 import Basics
 
 extension LegacyHTTPClient {
-    package static func mock(fileSystem: FileSystem) -> LegacyHTTPClient {
+    public static func mock(fileSystem: FileSystem) -> LegacyHTTPClient {
         let handler: LegacyHTTPClient.Handler = { request, _, completion in
             switch request.kind {
             case.generic:

Sources/SPMTestSupport/MockHTTPClient.swift

@@ -15,17 +15,17 @@ import Basics
 import struct TSCBasic.ByteString
 import protocol TSCBasic.HashAlgorithm
 
-package final class MockHashAlgorithm {
-    package typealias Handler = @Sendable (ByteString) -> ByteString
+public final class MockHashAlgorithm {
+    public typealias Handler = @Sendable (ByteString) -> ByteString
 
-    package let hashes = ThreadSafeArrayStore<ByteString>()
+    public let hashes = ThreadSafeArrayStore<ByteString>()
     private let handler: Handler?
 
-    package init(handler: Handler? = nil) {
+    public init(handler: Handler? = nil) {
         self.handler = handler
     }
 
-    package func hash(_ hash: ByteString) -> ByteString {
+    public func hash(_ hash: ByteString) -> ByteString {
         if let handler = self.handler {
             return handler(hash)
         } else {