Merge pull request #83 from mbuchetics/master

ReactiveCocoa 4.0 support

Author: neilpa

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "antitypical/Result" "1.0.1"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0"
+github "antitypical/Result" "1.0.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.1"

Rex.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = 'Rex'
   s.module_name  = 'Rex'
-  s.version      = '0.9.0-RC.2'
+  s.version      = '0.9.0'
   s.summary      = 'ReactiveCocoa Extensions'
 
   s.description  = <<-DESC
@@ -18,8 +18,8 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '2.0'
   s.tvos.deployment_target = '9.0'
 
-  s.source       = { :git => 'https://github.com/neilpa/Rex.git', :tag => '0.9.0-RC.2' }
-  s.dependency 'ReactiveCocoa', '4.0.0-RC.2'
+  s.source       = { :git => 'https://github.com/neilpa/Rex.git', :tag => '0.9.0' }
+  s.dependency 'ReactiveCocoa', '~> 4.0'
   s.ios.framework  = 'UIKit'
   s.osx.framework  = 'AppKit'
 

Source/Action.swift

@@ -7,6 +7,7 @@
 //
 
 import ReactiveCocoa
+import enum Result.NoError
 
 extension Action {
     /// Creates an always disabled action.

Source/AppKit/NSTextField.swift

@@ -9,6 +9,7 @@
 import Foundation
 import ReactiveCocoa
 import AppKit
+import enum Result.NoError
 
 extension NSTextField {
     /// Sends the field's string value whenever it changes.

Source/Foundation/NSObject.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import ReactiveCocoa
+import enum Result.NoError
 
 extension NSObject {
     /// Creates a strongly-typed producer to monitor `keyPath` via KVO. The caller

Source/Foundation/NSUserDefaults.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import ReactiveCocoa
+import enum Result.NoError
 
 extension NSUserDefaults {
     /// Sends value of `key` whenever it changes. Attempts to filter out repeats

Source/Property.swift

@@ -7,6 +7,7 @@
 //
 
 import ReactiveCocoa
+import enum Result.NoError
 
 extension PropertyType where Value == Bool {
     /// The conjunction of `self` and `other`.

Source/Signal.swift

@@ -7,6 +7,7 @@
 //
 
 import ReactiveCocoa
+import enum Result.NoError
 
 extension SignalType {
 

Source/SignalProducer.swift

@@ -7,6 +7,7 @@
 //
 
 import ReactiveCocoa
+import enum Result.NoError
 
 extension SignalProducerType {
 

Source/UIKit/UIControl.swift

@@ -8,6 +8,7 @@
 
 import ReactiveCocoa
 import UIKit
+import enum Result.NoError
 
 extension UIControl {
 #if os(iOS)