Skip to content

Commit

Permalink
Update dependencies to get new version of When
Browse files Browse the repository at this point in the history
Requires adding `open override` to `Ride.cancel()`
and adding a SwiftLint rule exception to not cause
a build error due to uppercased enum cases. This is
done to not have to break the public API.
  • Loading branch information
JohnSundell committed May 31, 2017
1 parent 374f14e commit bbbc6c5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ excluded: # paths to ignore during linting. Takes precedence over `included`.
- Pods
disabled_rules:
- type_name
- identifier_name

# configurable rules can be customized from this configuration file
# binary rules can set their severity level
Expand Down
7 changes: 4 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "Quick/Nimble" "v6.0.1"
github "Quick/Quick" "v1.0.0"
github "vadymmarkov/When" "2.0.0"
github "Quick/Nimble" "v7.0.0"
github "Quick/Quick" "v1.1.0"
github "ReactiveX/RxSwift" "3.5.0"
github "vadymmarkov/When" "2.3.3"
2 changes: 1 addition & 1 deletion Sources/Request/Ride.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public final class Ride: Promise<Wave> {
super.init()
}

public func cancel() {
open override func cancel() {
operation?.cancel()
operation = nil
}
Expand Down

0 comments on commit bbbc6c5

Please sign in to comment.