Skip to content

Commit 82006c0

Browse files
authored
Merge pull request #306 from ReactiveCocoa/update-nimble
Update Nimble to 6.1.0
2 parents 8b790eb + 615115a commit 82006c0

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

.Package.test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ let package = Package(
55
dependencies: [
66
.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
77
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
8-
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),
8+
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6, minor: 1),
99
]
1010
)

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ matrix:
6666
- JOB=PODSPEC
6767
- script:
6868
- mv .Package.test.swift Package.swift
69-
- swift package update
70-
- cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
7169
- swift build
7270
- swift test
7371
env:
@@ -80,8 +78,6 @@ matrix:
8078
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
8179
script:
8280
- mv .Package.test.swift Package.swift
83-
- swift package update
84-
- cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
8581
- swift build
8682
- swift test
8783
env: JOB=SWIFTPM_LINUX

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "3d9d996"
22
github "Quick/Quick" ~> 1.1
3-
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
3+
github "Quick/Nimble" ~> 6.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
1+
github "Quick/Nimble" "v6.1.0"
22
github "Quick/Quick" "v1.1.0"
33
github "antitypical/Result" "3.2.1"
44
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

Carthage/Checkouts/Nimble

Submodule Nimble updated 31 files

0 commit comments

Comments
 (0)