Skip to content

Commit 97005e1

Browse files
committed
update swiftpm to depend on swift testing when building using local deps
1 parent 9f75bbb commit 97005e1

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

Package.swift

+1-6
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,12 @@ let swiftPMDataModelProduct = (
5858
let usePackageDependencies = ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil
5959

6060
let swiftTestingTargetDep: [Target.Dependency]
61-
let swiftTestingPackageDeps: [Package.Dependency]
6261
if !usePackageDependencies {
6362
swiftTestingTargetDep = [
6463
.product(name: "Testing", package: "swift-testing"),
6564
]
66-
swiftTestingPackageDeps = [
67-
.package(path: "../swift-testing"),
68-
]
6965
} else {
7066
swiftTestingTargetDep = []
71-
swiftTestingPackageDeps = []
7267
}
7368

7469
/** The `libSwiftPM` set of interfaces to programmatically work with Swift
@@ -1030,7 +1025,6 @@ if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil {
10301025
]
10311026
}
10321027

1033-
package.dependencies += swiftTestingPackageDeps
10341028
if usePackageDependencies {
10351029
package.dependencies += [
10361030
.package(url: "https://github.com/swiftlang/swift-tools-support-core.git", branch: relatedDependenciesBranch),
@@ -1056,6 +1050,7 @@ if usePackageDependencies {
10561050
.package(path: "../swift-system"),
10571051
.package(path: "../swift-collections"),
10581052
.package(path: "../swift-certificates"),
1053+
.package(path: "../swift-testing"),
10591054
.package(path: "../swift-toolchain-sqlite"),
10601055
]
10611056
}

0 commit comments

Comments
 (0)