Skip to content

Commit 4a85545

Browse files
authored
Merge pull request #83 from Carthage/swiftpm-test-dependencies-workaround
[SwiftPM] Remove test dependencies from `Package.swift`
2 parents 5267e86 + 0f0dd8e commit 4a85545

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.Package.test.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "Commandant",
5+
dependencies: [
6+
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0),
7+
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 5),
8+
.Package(url: "https://github.com/Quick/Quick", majorVersion: 0, minor: 10),
9+
]
10+
)

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ matrix:
1919
osx_image: xcode8
2020
language: objective-c
2121
env: JOB=SPM
22-
- script: swift build && swift test
22+
- script:
23+
- mv .Package.test.swift Package.swift
24+
- swift build
25+
- swift test
2326
env: JOB=Linux
2427
sudo: required
2528
dist: trusty

Package.swift

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@ import PackageDescription
22

33
let package = Package(
44
name: "Commandant",
5-
dependencies: {
6-
#if os(macOS)
7-
return [
8-
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0),
9-
]
10-
#else
11-
return [
12-
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0),
13-
.Package(url: "https://github.com/Quick/Quick", majorVersion: 0, minor: 10),
14-
]
15-
#endif
16-
}()
5+
dependencies: [
6+
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3, minor: 0),
7+
]
178
)

0 commit comments

Comments
 (0)