Merge pull request #71 from hyperoslo/update-when

Update dependencies to get new version of When
vadymmarkov · May 31, 2017 · 95e0c44 · 95e0c44
2 parents 374f14e + bbbc6c5
commit 95e0c44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -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

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -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"
diff --git a/Sources/Request/Ride.swift b/Sources/Request/Ride.swift
@@ -10,7 +10,7 @@ public final class Ride: Promise<Wave> {
     super.init()
   }
 
-  public func cancel() {
+  open override func cancel() {
     operation?.cancel()
     operation = nil
   }