Skip to content

Commit ccb5a25

Browse files
committed
1 parent b0d3b68 commit ccb5a25

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

.Package.test.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ let package = Package(
44
name: "ReactiveSwift",
55
dependencies: [
66
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3),
7-
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 0),
8-
.Package(url: "https://github.com/Quick/Quick", majorVersion: 0, minor: 10),
7+
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
8+
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),
99
],
1010
exclude: [
1111
"Sources/Deprecations+Removals.swift",

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ matrix:
8080
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
8181
script:
8282
- mv .Package.test.swift Package.swift
83-
# https://github.com/Quick/Nimble/pull/342 is needed.
84-
- swift package update
85-
- cd Packages/Nimble-*
86-
- git checkout v5.1.1
87-
- cd ../../
8883
- swift build
8984
- swift test
9085
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"
2-
github "Quick/Quick" ~> 0.10
2+
github "Quick/Quick" ~> 1.0
33
github "Quick/Nimble" ~> 5.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "Quick/Nimble" "v5.1.1"
2-
github "Quick/Quick" "v0.10.0"
2+
github "Quick/Quick" "v1.0.0"
33
github "antitypical/Result" "3.0.0"
44
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

Carthage/Checkouts/Quick

Submodule Quick updated 48 files

0 commit comments

Comments
 (0)