Require Rx 3.4.0, migrate bindTo() -> bind(to:)

Author: Tom Burns

Action.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Action"
-  s.version      = "2.2.2"
+  s.version      = "3.0.0"
   s.summary      = "Abstracts actions to be performed in RxSwift."
   s.description  = <<-DESC
     Encapsulates an action to be performed, usually by a UIButton press.
@@ -21,8 +21,8 @@ Pod::Spec.new do |s|
   s.source_files  = "Sources/**/*.{swift}"
 
   s.frameworks  = "Foundation"
-  s.dependency "RxSwift", "~> 3.0"
-  s.dependency "RxCocoa", "~> 3.0"
+  s.dependency "RxSwift", "~> 3.4.0"
+  s.dependency "RxCocoa", "~> 3.4.0"
 
   s.watchos.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"
   s.osx.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 3.3.0
+github "ReactiveX/RxSwift" ~> 3.4.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v1.0.0"
-github "ReactiveX/RxSwift" "3.3.0"
+github "Quick/Nimble" "v6.1.0"
+github "Quick/Quick" "v1.1.0"
+github "ReactiveX/RxSwift" "3.4.0"

Carthage/Checkouts/Nimble

@@ -38,7 +38,7 @@ public extension Reactive where Base: UIBarButtonItem {
         }
     }
 
-    public func bindTo<Input, Output>(action: Action<Input, Output>, inputTransform: @escaping (Base) -> (Input)) {
+    public func bind<Input, Output>(to action: Action<Input, Output>, inputTransform: @escaping (Base) -> (Input)) {
         unbindAction()
 
         self.tap
@@ -52,8 +52,8 @@ public extension Reactive where Base: UIBarButtonItem {
             .addDisposableTo(self.base.actionDisposeBag)
     }
 
-    public func bindTo<Input, Output>(action: Action<Input, Output>, input: Input) {
-        self.bind(to: action: action) { _ in input}
+    public func bind<Input, Output>(to action: Action<Input, Output>, input: Input) {
+        self.bind(to: action) { _ in input}
     }
 
     /// Unbinds any existing action, disposing of all subscriptions.

Carthage/Checkouts/Quick

@@ -55,7 +55,7 @@ public extension Reactive where Base: UIButton {
     /// Binds enabled state of action to button, and subscribes to rx_tap to execute action with given input transform.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, call bindToAction with another action or call unbindAction().
-    public func bindTo<Input, Output>(action:Action<Input, Output>, inputTransform: @escaping (Base) -> (Input))   {
+    public func bind<Input, Output>(to action: Action<Input, Output>, inputTransform: @escaping (Base) -> (Input))   {
         // This effectively disposes of any existing subscriptions.
         unbindAction()
 
@@ -72,14 +72,14 @@ public extension Reactive where Base: UIButton {
         guard let controlEvent = lookupControlEvent else {
             return
         }
-        self.bind(to: action: action, controlEvent: controlEvent, inputTransform: inputTransform)
+        self.bind(to: action, controlEvent: controlEvent, inputTransform: inputTransform)
     }
 
     /// Binds enabled state of action to button, and subscribes to rx_tap to execute action with given input value.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, call bindToAction with another action or call unbindAction().
-    public func bindTo<Input, Output>(action: Action<Input, Output>, input: Input) {
-        self.bind(to: action: action) { _ in input }
+    public func bind<Input, Output>(to action: Action<Input, Output>, input: Input) {
+        self.bind(to: action) { _ in input }
     }
 }
 #endif

Carthage/Checkouts/RxSwift

@@ -7,7 +7,7 @@ public extension Reactive where Base: UIControl {
     /// Binds enabled state of action to control, and subscribes action's execution to provided controlEvents.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, set the rx.action to nil or another action, or call unbindAction().
-    public func bindTo<Input, Output>(action: Action<Input, Output>, controlEvent: ControlEvent<Void>, inputTransform: @escaping (Base) -> (Input))   {
+    public func bind<Input, Output>(to action: Action<Input, Output>, controlEvent: ControlEvent<Void>, inputTransform: @escaping (Base) -> (Input))   {
         // This effectively disposes of any existing subscriptions.
         unbindAction()
 

Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift

@@ -26,7 +26,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            button.rx.bind(to: action: action, input: "Hi there!")
+            button.rx.bind(to: action, input: "Hi there!")
             // Setting the action has an asynchronous effect of adding a target.
             expect(button.allTargets).toEventuallyNot( beEmpty() )
 
@@ -42,7 +42,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            button.rx.bind(to: action: action, controlEvent: button.rx.tap, inputTransform: { input in "\(input)" })
+            button.rx.bind(to: action, controlEvent: button.rx.tap, inputTransform: { input in "\(input)" })
             // Setting the action has an asynchronous effect of adding a target.
             expect(button.allTargets).toEventuallyNot( beEmpty() )
 
@@ -58,7 +58,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            item.rx.bind(to: action: action, input: "Hi there!")
+            item.rx.bind(to: action, input: "Hi there!")
 
             _ = item.target!.perform(item.action!, with: item)
 
@@ -72,7 +72,7 @@ class BindToTests: QuickSpec {
                     assertionFailure()
                     return .empty()
                 })
-                button.rx.bind(to: action: action, input: "Hi there!")
+                button.rx.bind(to: action, input: "Hi there!")
                 // Setting the action has an asynchronous effect of adding a target.
                 expect(button.allTargets).toEventuallyNot( beEmpty() )
 
@@ -89,7 +89,7 @@ class BindToTests: QuickSpec {
                     called = true
                     return .empty()
                 })
-                item.rx.bind(to: action: action, input: "Hi there!")
+                item.rx.bind(to: action, input: "Hi there!")
 
                 item.rx.unbindAction()
                 _ = item.target?.perform(item.action!, with: item)