Rac5 swift3

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "RAC5"
+github "ReactiveCocoa/ReactiveCocoa" "master"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "antitypical/Result" "8f1affd40bc2b10a15f56ff6cb7b00639e29cb35"
-github "ReactiveCocoa/ReactiveCocoa" "8213f2e47c3228ad1895bf74c9b6dba541a45aa7"
+github "antitypical/Result" "3.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "d98489ae97b020ccdd9a8c8ccad2b67429817669"

Deprecations+Removals.swift

@@ -39,7 +39,7 @@ extension Data {
     public static func rex_dataWithContentsOfURL(_ url: URL, options: Data.ReadingOptions = []) -> SignalProducer<Data, NSError> { fatalError() }
 }
 
-extension NSData {
+extension Data {
     @available(*, unavailable, renamed:"rex_data(contentsOf:options:)")
     public static func rex_dataWithContentsOfURL(_ url: URL, options: NSData.ReadingOptions = []) -> SignalProducer<NSData, NSError> { fatalError() }
 }

Rex.xcodeproj/project.pbxproj

@@ -740,9 +740,11 @@
 					};
 					D83457131AFEE44E0070616A = {
 						CreatedOnToolsVersion = 6.3;
+						LastSwiftMigration = 0800;
 					};
 					D834571D1AFEE44E0070616A = {
 						CreatedOnToolsVersion = 6.3;
+						LastSwiftMigration = 0800;
 					};
 					D8715D931C210F97005F4191 = {
 						CreatedOnToolsVersion = 7.2;
@@ -1221,6 +1223,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1248,6 +1251,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1273,6 +1277,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "me.neilpa.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1292,6 +1297,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Source/Foundation/Data.swift

@@ -23,7 +23,7 @@ extension Data {
     }
 }
 
-extension NSData {
+extension Data {
     /// Read the data at the URL, sending the result or an error.
     public static func rex_data(contentsOf url: URL, options: NSData.ReadingOptions = []) -> SignalProducer<NSData, NSError> {
         return Data.rex_data(contentsOf: url, options: options).map { $0 as NSData }

Source/Foundation/UserDefaults.swift

@@ -28,7 +28,7 @@ extension UserDefaults {
         return SignalProducer<AnyObject?, NoError>(value: initial)
             .concat(changes)
             .skipRepeats { previous, next in
-                if let previous = previous as? NSObject, next = next as? NSObject {
+                if let previous = previous as? NSObject, let next = next as? NSObject {
                     return previous == next
                 }
                 return false

Source/SignalProducer.swift

@@ -18,7 +18,7 @@ extension SignalProducerProtocol {
         return SignalProducer<(Key, SignalProducer<Value, Error>), Error> { observer, disposable in
             var groups: [Key: Signal<Value, Error>.Observer] = [:]
 
-            let lock = RecursiveLock()
+            let lock = NSRecursiveLock()
             lock.name = "me.neilpa.rex.groupBy"
 
             self.start { event in
@@ -96,7 +96,7 @@ extension SignalProducerProtocol {
     }
 
     /// Delays retrying on failure by `interval` up to `count` attempts.
-    public func deferredRetry(interval: TimeInterval, on scheduler: DateSchedulerProtocol, count: Int = .max) -> SignalProducer<Value, Error> {
+    public func deferredRetry(_ interval: TimeInterval, on scheduler: DateSchedulerProtocol, count: Int = .max) -> SignalProducer<Value, Error> {
         precondition(count >= 0)
 
         if count == 0 {
@@ -205,25 +205,25 @@ private final class ReplayBuffer<Value> {
     private var values: [Value] = []
 }
 
-private struct BufferState<Value, Error: ErrorProtocol> {
+private struct BufferState<V, E: Error> {
     /// All values in the buffer.
-    var values: [Value] = []
+    var values: [V] = []
 
     /// Any terminating event sent to the buffer.
     ///
     /// This will be nil if termination has not occurred.
-    var terminationEvent: Event<Value, Error>?
+    var terminationEvent: Event<V, E>?
 
     /// The observers currently attached to the buffered producer, or nil if the
     /// producer was terminated.
-    var observers: Bag<Signal<Value, Error>.Observer>? = Bag()
+    var observers: Bag<Signal<V, E>.Observer>? = Bag()
 
     /// The set of unused replay token identifiers.
-    var replayBuffers: Bag<ReplayBuffer<Value>> = Bag()
+    var replayBuffers: Bag<ReplayBuffer<V>> = Bag()
 
     /// Appends a new value to the buffer, trimming it down to the given capacity
     /// if necessary.
-    mutating func add(_ value: Value, upTo capacity: Int) {
+    mutating func add(_ value: V, upTo capacity: Int) {
         precondition(capacity >= 0)
 
         for buffer in replayBuffers {

Source/UIKit/UIActivityIndicatorView.swift

@@ -15,15 +15,14 @@ extension UIActivityIndicatorView {
     /// Setting a new value to the property would call `startAnimating()` or
     /// `stopAnimating()` depending on the value.
     public var rex_animating: MutableProperty<Bool> {
-        return associatedProperty(self, key: &animatingKey, initial: { $0.isAnimating() }, setter: { host, animating in
+        return associatedProperty(self, key: &animatingKey, initial: { $0.isAnimating }, setter: { host, animating in
             if animating {
                 host.startAnimating()
             } else {
                 host.stopAnimating()
             }
         })
     }
-
 }
 
 private var animatingKey: UInt8 = 0

Source/UIKit/UILabel.swift

@@ -16,7 +16,7 @@ extension UILabel {
     }
 
     /// Wraps a label's `attributedText` value in a bindable property.
-    public var rex_attributedText: MutableProperty<AttributedString?> {
+    public var rex_attributedText: MutableProperty<NSAttributedString?> {
         return associatedProperty(self, key: &attributedTextKey, initial: { $0.attributedText }, setter: { $0.attributedText = $1 })
     }
 

Tests/ActionTests.swift

@@ -13,7 +13,7 @@ import enum Result.NoError
 
 final class ActionTests: XCTestCase {
 
-    enum TestError: ErrorProtocol {
+    enum TestError: Error {
         case unknown
     }
 

Tests/Foundation/NSObjectTests.swift

@@ -25,8 +25,8 @@ final class NSObjectTests: XCTestCase {
 
     func testObjectsWillBeDeallocatedSignal() {
 
-        let expectation = self.expectation(withDescription: "Expected timer to send `completed` event when object deallocates")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected timer to send `completed` event when object deallocates")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let object = Object()
 

Tests/PropertyTests.swift

@@ -32,7 +32,7 @@ final class PropertyTests: XCTestCase {
         XCTAssertTrue(current!)
 
         let (signal, pipe) = Signal<Bool, NoError>.pipe()
-        let and2 = and.and(AnyProperty(initial: false, then: signal))
+        let and2 = and.and(Property(initial: false, then: signal))
         and2.producer.startWithNext { current = $0 }
 
         XCTAssertFalse(and2.value)
@@ -62,7 +62,7 @@ final class PropertyTests: XCTestCase {
         XCTAssertFalse(current!)
 
         let (signal, pipe) = Signal<Bool, NoError>.pipe()
-        let or2 = or.or(AnyProperty(initial: true, then: signal))
+        let or2 = or.or(Property(initial: true, then: signal))
         or2.producer.startWithNext { current = $0 }
 
         XCTAssertTrue(or2.value)

Tests/SignalProducerTests.swift

@@ -98,7 +98,7 @@ final class SignalProducerTests: XCTestCase {
         var value = -1
         var completed = false
         producer
-            .deferredRetry(interval: 1, on: scheduler)
+            .deferredRetry(1, on: scheduler)
             .start(Observer(
                 next: { value = $0 },
                 completed: { completed = true }
@@ -136,7 +136,7 @@ final class SignalProducerTests: XCTestCase {
         var value = -1
         var failed = false
         producer
-            .deferredRetry(interval: 1, on: scheduler, count: 2)
+            .deferredRetry(1, on: scheduler, count: 2)
             .start(Observer(
                 next: { value = $0 },
                 failed: { _ in failed = true }

Tests/SignalTests.swift

@@ -186,6 +186,6 @@ final class SignalTests: XCTestCase {
     }
 }
 
-enum TestError: ErrorProtocol {
+enum TestError: Error {
     case `default`
 }

Tests/UIKit/UIActivityIndicatorViewTests.swift

@@ -27,8 +27,8 @@ class UIActivityIndicatorTests: XCTestCase {
         indicatorView.rex_animating <~ SignalProducer(signal: pipeSignal)
 
         observer.sendNext(true)
-        XCTAssertTrue(indicatorView.isAnimating())
+        XCTAssertTrue(indicatorView.isAnimating)
         observer.sendNext(false)
-        XCTAssertFalse(indicatorView.isAnimating())
+        XCTAssertFalse(indicatorView.isAnimating)
     }
 }

Tests/UIKit/UIDatePickerTests.swift

@@ -31,8 +31,8 @@ class UIDatePickerTests: XCTestCase {
     }
 
     func testUpdatePropertyFromPicker() {
-        let expectation = self.expectation(withDescription: "Expected rex_date to send an event when picker's date value is changed by a UI event")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_date to send an event when picker's date value is changed by a UI event")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         picker.rex_date.signal.observeNext { changedDate in
             XCTAssertEqual(changedDate, self.date)

Tests/UIKit/UILabelTests.swift

@@ -50,18 +50,18 @@ class UILabelTests: XCTestCase {
         let label = UILabel(frame: CGRect.zero)
         _label = label
 
-        label.rex_attributedText <~ SignalProducer(value: AttributedString(string: "Test"))
+        label.rex_attributedText <~ SignalProducer(value: NSAttributedString(string: "Test"))
         XCTAssert(_label?.attributedText?.string == "Test")
     }
 
     func testAttributedTextProperty() {
-        let firstChange = AttributedString(string: "first")
-        let secondChange = AttributedString(string: "second")
+        let firstChange = NSAttributedString(string: "first")
+        let secondChange = NSAttributedString(string: "second")
 
         let label = UILabel(frame: CGRect.zero)
-        label.attributedText = AttributedString(string: "")
+        label.attributedText = NSAttributedString(string: "")
 
-        let (pipeSignal, observer) = Signal<AttributedString?, NoError>.pipe()
+        let (pipeSignal, observer) = Signal<NSAttributedString?, NoError>.pipe()
         label.rex_attributedText <~ SignalProducer(signal: pipeSignal)
 
         observer.sendNext(firstChange)
@@ -71,13 +71,13 @@ class UILabelTests: XCTestCase {
     }
 
     func testTextColorProperty() {
-        let firstChange = UIColor.red()
-        let secondChange = UIColor.black()
+        let firstChange = UIColor.red
+        let secondChange = UIColor.black
 
         let label = UILabel(frame: CGRect.zero)
 
         let (pipeSignal, observer) = Signal<UIColor, NoError>.pipe()
-        label.textColor = UIColor.black()
+        label.textColor = UIColor.black
         label.rex_textColor <~ SignalProducer(signal: pipeSignal)
 
         observer.sendNext(firstChange)

Tests/UIKit/UITextFieldTests.swift

@@ -13,8 +13,8 @@ import XCTest
 class UITextFieldTests: XCTestCase {
 
     func testTextProperty() {
-        let expectation = self.expectation(withDescription: "Expected `rex_text`'s value to equal to the textField's text")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected `rex_text`'s value to equal to the textField's text")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let textField = UITextField(frame: CGRect.zero)
         textField.text = "Test"

Tests/UIKit/UITextViewTests.swift

@@ -13,8 +13,8 @@ import XCTest
 class UITextViewTests: XCTestCase {
 
     func testTextProperty() {
-        let expectation = self.expectation(withDescription: "Expected `rex_text`'s value to equal to the textViews's text")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected `rex_text`'s value to equal to the textViews's text")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let textView = UITextView(frame: CGRect.zero)
         textView.text = "Test"

Tests/UIKit/UIViewControllerTests.swift

@@ -22,8 +22,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testViewDidDisappear() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_viewDidDisappear to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_viewDidDisappear to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController
@@ -37,8 +37,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testViewWillDisappear() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_viewWillDisappear to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_viewWillDisappear to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController
@@ -52,8 +52,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testViewDidAppear() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_viewDidAppear to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_viewDidAppear to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController
@@ -67,8 +67,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testViewWillAppear() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_viewWillAppear to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_viewWillAppear to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController
@@ -82,8 +82,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testDismissViewController_via_property() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_dismissModally to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_dismissModally to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController
@@ -97,8 +97,8 @@ class UIViewControllerTests: XCTestCase {
 
     func testDismissViewController_via_cocoaDismiss() {
 
-        let expectation = self.expectation(withDescription: "Expected rex_dismissModally to be triggered")
-        defer { self.waitForExpectations(withTimeout: 2, handler: nil) }
+        let expectation = self.expectation(description: "Expected rex_dismissModally to be triggered")
+        defer { self.waitForExpectations(timeout: 2, handler: nil) }
 
         let viewController = UIViewController()
         _viewController = viewController