Skip to content

Commit d8de15e

Browse files
committed
rename to testDependencies
1 parent 5b9c170 commit d8de15e

File tree

20 files changed

+30
-30
lines changed

20 files changed

+30
-30
lines changed

Documentation/Package.swift.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let package = Package(
5555
```
5656

5757
A package can require dependencies that are only needed during develop,
58-
as example for testing purposes. `devDependencies` are only fetched
58+
as example for testing purposes. `testDependencies` are only fetched
5959
when you build current package. They are not fetched if a package is
6060
specified as a dependency in other package.
6161

@@ -64,7 +64,7 @@ import PackageDescription
6464

6565
let package = Package(
6666
name: "Hello",
67-
devDependencies: [
67+
testDependencies: [
6868
.Package(url: "ssh://git@example.com/Tester.git", versions: Version(1,0,0)..<Version(2,0,0)),
6969
]
7070
)

Sources/PackageDescription/Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ public final class Package {
5757
public var dependencies: [Dependency]
5858

5959
/// The list of private dependencies. They aren't exposed to a parent Package
60-
public var devDependencies: [Dependency]
60+
public var testDependencies: [Dependency]
6161

6262
/// The list of folders to exclude.
6363
public var exclude: [String]
6464

6565
/// Construct a package.
66-
public init(name: String? = nil, targets: [Target] = [], dependencies: [Dependency] = [], devDependencies: [Dependency] = [], exclude: [String] = []) {
66+
public init(name: String? = nil, targets: [Target] = [], dependencies: [Dependency] = [], testDependencies: [Dependency] = [], exclude: [String] = []) {
6767
self.name = name
6868
self.targets = targets
6969
self.dependencies = dependencies
70-
self.devDependencies = devDependencies
70+
self.testDependencies = testDependencies
7171
self.exclude = exclude
7272

7373
// Add custom exit handler to cause package to be dumped at exit, if requested.
@@ -102,8 +102,8 @@ extension Package: TOMLConvertible {
102102
}
103103
result += "]\n"
104104

105-
result += "devDependencies = ["
106-
for dependency in devDependencies {
105+
result += "testDependencies = ["
106+
for dependency in testDependencies {
107107
result += dependency.toTOML()
108108
}
109109
result += "]\n"

Sources/dep/Manifest.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ extension PackageDescription.Package {
4444
}
4545

4646
// Parse the private dependencies.
47-
var devDependencies: [PackageDescription.Package.Dependency] = []
48-
if case .Some(.Array(let array)) = table.items["devDependencies"] {
47+
var testDependencies: [PackageDescription.Package.Dependency] = []
48+
if case .Some(.Array(let array)) = table.items["testDependencies"] {
4949
for item in array.items {
50-
devDependencies.append(PackageDescription.Package.Dependency.fromTOML(item, baseURL: baseURL))
50+
testDependencies.append(PackageDescription.Package.Dependency.fromTOML(item, baseURL: baseURL))
5151
}
5252
}
5353

@@ -60,7 +60,7 @@ extension PackageDescription.Package {
6060
}
6161
}
6262

63-
return PackageDescription.Package(name: name, targets: targets, dependencies: dependencies, devDependencies: devDependencies, exclude: exclude)
63+
return PackageDescription.Package(name: name, targets: targets, dependencies: dependencies, testDependencies: testDependencies, exclude: exclude)
6464
}
6565
}
6666

Sources/swift-build/main.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ do {
5454
try llbuild(srcroot: pkg.path, targets: try pkg.targets(), dependencies: dependencies, prefix: builddir, tmpdir: Path.join(builddir, "\(pkg.name).o"), configuration: configuration)
5555
}
5656

57-
let devDependencies = try get(manifest.package.devDependencies, prefix: depsdir)
58-
for pkg in devDependencies {
59-
try llbuild(srcroot: pkg.path, targets: try pkg.targets(), dependencies: devDependencies, prefix: builddir, tmpdir: Path.join(builddir, "\(pkg.name).o"), configuration: configuration)
57+
let testDependencies = try get(manifest.package.testDependencies, prefix: depsdir)
58+
for pkg in testDependencies {
59+
try llbuild(srcroot: pkg.path, targets: try pkg.targets(), dependencies: testDependencies, prefix: builddir, tmpdir: Path.join(builddir, "\(pkg.name).o"), configuration: configuration)
6060
}
6161

6262
do {
6363
// build the current directory
64-
try llbuild(srcroot: rootd, targets: targets, dependencies: dependencies + devDependencies, prefix: builddir, tmpdir: Path.join(builddir, "\(pkgname).o"), configuration: configuration)
64+
try llbuild(srcroot: rootd, targets: targets, dependencies: dependencies + testDependencies, prefix: builddir, tmpdir: Path.join(builddir, "\(pkgname).o"), configuration: configuration)
6565
} catch POSIX.Error.ExitStatus(let foo) {
6666
#if os(Linux)
6767
// it is a common error on Linux for clang++ to not be installed, but

Tests/PackageDescription/PackageDescriptionTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class PackageTests: XCTestCase, XCTestCaseProvider {
2828
return [
2929
("testBasics", testBasics),
3030
("testExclude", testExclude),
31-
("testEmptyPrivateDependencies", testEmptyPrivateDependencies),
32-
("testPrivateDependencies", testPrivateDependencies),
31+
("testEmptyTestDependencies", testEmptyTestDependencies),
32+
("testTestDependencies", testTestDependencies),
3333
]
3434
}
3535

@@ -46,15 +46,15 @@ class PackageTests: XCTestCase, XCTestCaseProvider {
4646
XCTAssertEqual(pFromTOML.exclude, exclude)
4747
}
4848

49-
func testEmptyPrivateDependencies() {
50-
let p = Package(devDependencies: [])
51-
XCTAssertEqual(p.devDependencies, [])
49+
func testEmptyTestDependencies() {
50+
let p = Package(testDependencies: [])
51+
XCTAssertEqual(p.testDependencies, [])
5252
}
5353

54-
func testPrivateDependencies() {
54+
func testTestDependencies() {
5555
let dependencies = [Package.Dependency.Package(url: "../TestingLib", majorVersion: 1)]
56-
let p = Package(devDependencies: dependencies)
56+
let p = Package(testDependencies: dependencies)
5757
let pFromTOML = Package.fromTOML(parseTOML(p.toTOML()))
58-
XCTAssertEqual(pFromTOML.devDependencies, dependencies)
58+
XCTAssertEqual(pFromTOML.testDependencies, dependencies)
5959
}
6060
}

Tests/dep/Fixtures/30_dev_deps/App/Package.swift renamed to Tests/dep/Fixtures/30_test_deps/App/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let package = Package(
55
dependencies: [
66
.Package(url: "../Foo", majorVersion: 1)
77
],
8-
devDependencies: [
8+
testDependencies: [
99
.Package(url: "../PrivateLib", majorVersion: 1)
1010
]
1111
)

0 commit comments

Comments
 (0)