Skip to content

Commit 567f884

Browse files
mdiepmdiep
authored
Merge pull request #89 from Carthage/update-quick-and-nimble
Update Quick and Nimble
2 parents e440bc9 + f826f77 commit 567f884

6 files changed

Lines changed: 18 additions & 6 deletions

File tree

‎.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: "ReactiveTask",
5+
dependencies: [
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", majorVersion: 1),
7+
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
8+
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),
9+
]
10+
)

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ matrix:
1818
- os: osx
1919
osx_image: xcode8.2
2020
script:
21+
- mv .Package.test.swift Package.swift
2122
- swift build
23+
- swift test
2224
env: JOB=SWIFTPM_DARWIN
2325
notifications:
2426
email: false

‎Cartfile.private‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "3d9d996"
2-
github "Quick/Quick" ~> 1.0
3-
github "Quick/Nimble" ~> 5.0
2+
github "Quick/Quick" ~> 1.1
3+
github "Quick/Nimble" ~> 6.0

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "Quick/Nimble" "v5.1.1"
2-
github "Quick/Quick" "v1.0.0"
1+
github "Quick/Nimble" "v6.0.1"
2+
github "Quick/Quick" "v1.1.0"
33
github "antitypical/Result" "3.1.0"
44
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
55
github "ReactiveCocoa/ReactiveSwift" "1.0.0"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 77 files

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 52 files

0 commit comments

Comments
 (0)