Add Swift Testing Dependency

Author: bkhouri

Package.swift

@@ -86,20 +86,6 @@ let swiftPMProduct = (
 
 let usePackageDependencies = ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil
 
-let swiftTestingTargetDep: [Target.Dependency]
-let swiftTestingPackageDep: [Package.Dependency]
-if usePackageDependencies {
-    swiftTestingTargetDep = []
-    swiftTestingPackageDep = []
-} else {
-    swiftTestingTargetDep = [
-        .product(name: "Testing", package: "swift-testing")
-    ]
-    swiftTestingPackageDep = [
-        // .package(path: "../swift-testing"),
-    ]
-}
-
 #if os(Windows)
 let includeDynamicLibrary: Bool = false
 let systemSQLitePkgConfig: String? = nil
@@ -783,8 +769,8 @@ let package = Package(
                     "Build",
                     "XCBuildSupport",
                     "SwiftBuildSupport",
-                    "_InternalTestSupport"
-                ] + swiftTestingTargetDep,
+                    "_InternalTestSupport",
+                ],
                 swiftSettings: [
                     .unsafeFlags(["-static"]),
                 ]
@@ -803,8 +789,9 @@ let package = Package(
                 "SourceControl",
                 .product(name: "TSCTestSupport", package: "swift-tools-support-core"),
                 .product(name: "OrderedCollections", package: "swift-collections"),
+                .product(name: "Testing", package: "swift-testing"),
                 "Workspace",
-            ] + swiftTestingTargetDep,
+            ],
             swiftSettings: [
                 .unsafeFlags(["-static"]),
             ]
@@ -1090,6 +1077,7 @@ if usePackageDependencies {
         .package(url: "https://github.com/apple/swift-collections.git", "1.0.1" ..< "1.2.0"),
         .package(url: "https://github.com/apple/swift-certificates.git", "1.0.1" ..< "1.6.0"),
         .package(url: "https://github.com/swiftlang/swift-toolchain-sqlite.git", from: "1.0.0"),
+        .package(url: "https://github.com/swiftlang/swift-testing.git", branch: relatedDependenciesBranch),
         // For use in previewing documentation
         .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"),
     ]
@@ -1107,7 +1095,6 @@ if usePackageDependencies {
         .package(path: "../swift-toolchain-sqlite"),
     ]
 }
-package.dependencies += swiftTestingPackageDep
 
 /// If ENABLE_APPLE_PRODUCT_TYPES is set in the environment, then also define ENABLE_APPLE_PRODUCT_TYPES in each of the regular targets and test targets.
 if ProcessInfo.processInfo.environment["ENABLE_APPLE_PRODUCT_TYPES"] == "1" {

Sources/_InternalTestSupport/SwiftTestingHelpers.swift

@@ -0,0 +1 @@
+import Testing