Adopt MemberImportVisiblity - PackageGraphTests

Author: plemarquand

Package.swift

@@ -876,7 +876,10 @@ let package = Package(
         ),
         .testTarget(
             name: "PackageGraphTests",
-            dependencies: ["PackageGraph", "_InternalTestSupport"]
+            dependencies: ["PackageGraph", "_InternalTestSupport"],
+            swiftSettings: [
+                .enableExperimentalFeature("MemberImportVisibility"),
+            ],
         ),
         .testTarget(
             name: "PackageGraphPerformanceTests",

Sources/PackageGraph/ModulesGraph.swift

@@ -384,6 +384,8 @@ enum GraphError: Error {
     case unexpectedCycle
 }
 
+// TODO: Rename this back and only import what is required from TSCBasic to omit importing its implementation of topologicalSort
+
 /// Perform a topological sort of an graph.
 ///
 /// This function is optimized for use cases where cycles are unexpected, and

Tests/PackageGraphTests/CrossCompilationPackageGraphTests.swift

@@ -17,6 +17,7 @@ import _InternalTestSupport
 @testable
 import PackageGraph
 
+import PackageModel
 import XCTest
 
 final class CrossCompilationPackageGraphTests: XCTestCase {

Tests/PackageGraphTests/ModulesGraphTests.swift

@@ -11,6 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
+import PackageLoading
+import TSCUtility
 
 @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly)
 @testable import PackageGraph
@@ -2921,7 +2923,7 @@ final class ModulesGraphTests: XCTestCase {
         ]
 
         let expectedPlatformsForTests = customXCTestMinimumDeploymentTargets
-            .reduce(into: [Platform: PlatformVersion]()) { partialResult, entry in
+            .reduce(into: [PackageModel.Platform: PlatformVersion]()) { partialResult, entry in
                 if entry.value > entry.key.oldestSupportedVersion {
                     partialResult[entry.key] = entry.value
                 } else {

Tests/PackageGraphTests/TopologicalSortTests.swift

@@ -37,7 +37,7 @@ extension Int {
 extension Int: @retroactive Identifiable {}
 
 private func topologicalSort(_ nodes: [Int], _ successors: [Int: [Int]]) throws -> [Int] {
-    return try topologicalSort(nodes, successors: { successors[$0] ?? [] })
+    return try topologicalSortIdentifiable(nodes, successors: { successors[$0] ?? [] })
 }
 private func topologicalSort(_ node: Int, _ successors: [Int: [Int]]) throws -> [Int] {
     return try topologicalSort([node], successors)

Tests/PackageGraphTests/VersionSetSpecifierTests.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+import TSCUtility
 import XCTest
 
 import PackageGraph