From bbbc6c5981e78cc37437b033b6570a9054bfe04b Mon Sep 17 00:00:00 2001
From: John Sundell <josu@hyper.no>
Date: Wed, 31 May 2017 11:11:01 +0200
Subject: [PATCH] Update dependencies to get new version of When

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.
---
 .swiftlint.yml             | 1 +
 Cartfile.resolved          | 7 ++++---
 Sources/Request/Ride.swift | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index c6a18cf..98d2c4a 100644
--- 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
index 6bbc9c3..bec0289 100644
--- 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
index 3aaa732..338580c 100644
--- 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
   }