Merge pull request #87 from tomburns/deprecations

freak4pc · web-flow · commit 65de271644a1 · 2017-04-21T00:06:36.000+03:00
Resolve deprecations related to `bindTo` and update Action's API to match
diff --git a/Action.podspec b/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"
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 3.3.0
+github "ReactiveX/RxSwift" ~> 3.4.0
diff --git a/Cartfile.resolved b/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"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 3720e6b0f6de6d6435f79f8a174fb4bb92df5dc4
+Subproject commit e3c1a78af33b3fa778207fcc6ba33221838c0788
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 9c032315fafca658668d49f6396f1f24b09a83b2
+Subproject commit e4fa1e85c0305ba4e0866f25812d3fa398f3a048
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
@@ -1 +1 @@
-Subproject commit 84358af11882cfd2227e03b3648d1400eed08623
+Subproject commit 1048219ea8ed777ee7b2655888caae6f61268f7c
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,12 @@ Changelog
 Current master
 --------------
 
+3.0.0
+-----
+
+- Change `bindTo([...])` methods to `bind(to: [...])` to better align with the revised Rx API
+- Update Rx invocations to resolve deprecation warnings related to same
+
 2.2.2
 -----
 
diff --git a/Demo/ViewController.swift b/Demo/ViewController.swift
@@ -83,12 +83,12 @@ class ViewController: UIViewController {
             })
             .addDisposableTo(self.disposableBag)
 
-        button1.rx.bindTo(action: sharedAction, input: .button("Button 1"))
+        button1.rx.bind(to: action: sharedAction, input: .button("Button 1"))
 
-        button2.rx.bindTo(action: sharedAction) { _ in
+        button2.rx.bind(to: action: sharedAction) { _ in
             return .button("Button 2")
         }
-        self.navigationItem.leftBarButtonItem?.rx.bindTo(action: sharedAction, input: .barButton)
+        self.navigationItem.leftBarButtonItem?.rx.bind(to: action: sharedAction, input: .barButton)
 
         sharedAction.executing.debounce(0, scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
             if (executing) {
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ let package = Package(
     name: "Action",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 3)
+        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 4)
     ]
 )
 
diff --git a/Sources/Action/Action.swift b/Sources/Action/Action.swift
@@ -97,7 +97,7 @@ public final class Action<Input, Element> {
 
         Observable
             .combineLatest(executing, enabledIf) { !$0 && $1 }
-            .bindTo(enabledSubject)
+            .bind(to: enabledSubject)
             .addDisposableTo(disposeBag)
     }
 
diff --git a/Sources/Action/UIKitExtensions/AlertAction.swift b/Sources/Action/UIKitExtensions/AlertAction.swift
@@ -36,7 +36,7 @@ public extension Reactive where Base: UIAlertAction {
             if let action = newValue {
                 action
                     .enabled
-                    .bindTo(self.enabled)
+                    .bind(to: self.enabled)
                     .addDisposableTo(self.base.actionDisposeBag)
             }
         }
diff --git a/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift b/Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift
@@ -27,7 +27,7 @@ public extension Reactive where Base: UIBarButtonItem {
             if let action = newValue {
                 action
                     .enabled
-                    .bindTo(self.isEnabled)
+                    .bind(to: self.isEnabled)
                     .addDisposableTo(self.base.actionDisposeBag)
                 
                 self.tap.subscribe(onNext: { (_) in
@@ -38,22 +38,22 @@ 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
             .map { inputTransform(self.base) }
-            .bindTo(action.inputs)
+            .bind(to: action.inputs)
             .addDisposableTo(self.base.actionDisposeBag)
 
         action
             .enabled
-            .bindTo(self.isEnabled)
+            .bind(to: self.isEnabled)
             .addDisposableTo(self.base.actionDisposeBag)
     }
 
-    public func bindTo<Input, Output>(action: Action<Input, Output>, input: Input) {
-        self.bindTo(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.
diff --git a/Sources/Action/UIKitExtensions/UIButton+Rx.swift b/Sources/Action/UIKitExtensions/UIButton+Rx.swift
@@ -26,7 +26,7 @@ public extension Reactive where Base: UIButton {
             if let action = newValue {
                 action
                     .enabled
-                    .bindTo(self.isEnabled)
+                    .bind(to: self.isEnabled)
                     .addDisposableTo(self.base.actionDisposeBag)
                 
                 // Technically, this file is only included on tv/iOS platforms,
@@ -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.bindTo(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.bindTo(action: action) { _ in input }
+    public func bind<Input, Output>(to action: Action<Input, Output>, input: Input) {
+        self.bind(to: action) { _ in input }
     }
 }
 #endif
diff --git a/Sources/Action/UIKitExtensions/UIControl+Rx.swift b/Sources/Action/UIKitExtensions/UIControl+Rx.swift
@@ -7,20 +7,20 @@ 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()
 
         // For each tap event, use the inputTransform closure to provide an Input value to the action
         controlEvent
             .map { inputTransform(self.base) }
-            .bindTo(action.inputs)
+            .bind(to: action.inputs)
             .addDisposableTo(self.base.actionDisposeBag)
 
         // Bind the enabled state of the control to the enabled state of the action
         action
             .enabled
-            .bindTo(self.isEnabled)
+            .bind(to: self.isEnabled)
             .addDisposableTo(self.base.actionDisposeBag)
     }
 
diff --git a/Tests/ActionTests/ActionTests.swift b/Tests/ActionTests/ActionTests.swift
@@ -34,27 +34,27 @@ class ActionTests: QuickSpec {
 
             func bindAction(action: Action<String, String>) {
                 action.inputs
-                    .bindTo(inputs)
+                    .bind(to: inputs)
                     .addDisposableTo(disposeBag)
 
                 action.elements
-                    .bindTo(elements)
+                    .bind(to: elements)
                     .addDisposableTo(disposeBag)
 
                 action.errors
-                    .bindTo(errors)
+                    .bind(to: errors)
                     .addDisposableTo(disposeBag)
                 
                 action.enabled
-                    .bindTo(enabled)
+                    .bind(to: enabled)
                     .addDisposableTo(disposeBag)
                 
                 action.executing
-                    .bindTo(executing)
+                    .bind(to: executing)
                     .addDisposableTo(disposeBag)
 
                 action.executionObservables
-                    .bindTo(executionObservables)
+                    .bind(to: executionObservables)
                     .addDisposableTo(disposeBag)
 
                 // Dummy subscription for multiple subcription tests
@@ -376,18 +376,18 @@ class ActionTests: QuickSpec {
 
             func bindAndExecuteTwice(action: Action<String, String>) {
                 action.executionObservables
-                    .bindTo(executionObservables)
+                    .bind(to: executionObservables)
                     .addDisposableTo(disposeBag)
                 
                 scheduler.scheduleAt(10) {
                     action.execute("a")
-                        .bindTo(element)
+                        .bind(to: element)
                         .addDisposableTo(disposeBag)
                 }
 
                 scheduler.scheduleAt(20) {
                     action.execute("b")
-                        .bindTo(element)
+                        .bind(to: element)
                         .addDisposableTo(disposeBag)
                 }
 
@@ -484,18 +484,18 @@ class ActionTests: QuickSpec {
                     action = Action { Observable.just($0).sample(trigger) }
                     
                     action.executionObservables
-                        .bindTo(executionObservables)
+                        .bind(to: executionObservables)
                         .addDisposableTo(disposeBag)
                     
                     scheduler.scheduleAt(10) {
                         action.execute("a")
-                            .bindTo(element)
+                            .bind(to: element)
                             .addDisposableTo(disposeBag)
                     }
 
                     scheduler.scheduleAt(20) {
                         action.execute("b")
-                            .bindTo(secondElement)
+                            .bind(to: secondElement)
                             .addDisposableTo(disposeBag)
                     }
 
diff --git a/Tests/ActionTests/BindToTests.swift b/Tests/ActionTests/BindToTests.swift
@@ -26,7 +26,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            button.rx.bindTo(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.bindTo(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.bindTo(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.bindTo(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.bindTo(action: action, input: "Hi there!")
+                item.rx.bind(to: action, input: "Hi there!")
 
                 item.rx.unbindAction()
                 _ = item.target?.perform(item.action!, with: item)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveX/RxSwift" ~> 3.3.0`
	`1`	`+github "ReactiveX/RxSwift" ~> 3.4.0`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ let package = Package(`
`4`	`4`	`name: "Action",`
`5`	`5`	`targets: [],`
`6`	`6`	`dependencies: [`
`7`		`- .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 3)`
	`7`	`+ .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 4)`
`8`	`8`	`]`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public final class Action<Input, Element> {`
`97`	`97`
`98`	`98`	`Observable`
`99`	`99`	`.combineLatest(executing, enabledIf) { !$0 && $1 }`
`100`		`- .bindTo(enabledSubject)`
	`100`	`+ .bind(to: enabledSubject)`
`101`	`101`	`.addDisposableTo(disposeBag)`
`102`	`102`	`}`
`103`	`103`