Merge branch 'master' into 3.1-concrete-same-type-req-2

Author: andersio

.jazzy.yaml

@@ -40,6 +40,7 @@ custom_categories:
     - DateScheduler
     - Scheduler
   - name: Schedulers
+    children:
     - ImmediateScheduler
     - QueueScheduler
     - TestScheduler
@@ -62,6 +63,7 @@ custom_categories:
     - SimpleDisposable
     - +=(_:_:)
   - name: Debugging
+    children:
     - EventLogger
     - LoggingEvent
   - name: Utilities 
@@ -73,6 +75,7 @@ custom_categories:
     - Optional
     - OptionalProtocol
   - name: Deprecated
+    children:
     - AtomicProtocol
     - ActionProtocol
     - BindingTargetProtocol

ReactiveSwift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ReactiveSwift"
   # Version goes here and will be used to access the git tag later on, once we have a first release.
-  s.version      = "1.1.0"
+  s.version      = "1.1.1"
   s.summary      = "Streams of values over time"
   s.description  = <<-DESC
                    ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.

Sources/Action.swift

@@ -206,71 +206,13 @@ private struct ActionState {
 	}
 }
 
-/// A protocol used to constraint `Action` initializers.
-@available(swift, deprecated: 3.1, message: "This protocol is no longer necessary and will be removed in a future version of ReactiveSwift. Use Action directly instead.")
-public protocol ActionProtocol: BindingTargetProvider, BindingTargetProtocol {
-	/// The type of argument to apply the action to.
-	associatedtype Input
-	/// The type of values returned by the action.
-	associatedtype Output
-	/// The type of error when the action fails. If errors aren't possible then
-	/// `NoError` can be used.
-	associatedtype Error: Swift.Error
-
-	/// Initializes an action that will be conditionally enabled based on the
-	/// value of `state`. Creates a `SignalProducer` for each input and the
-	/// current value of `state`.
-	///
-	/// - note: `Action` guarantees that changes to `state` are observed in a
-	///         thread-safe way. Thus, the value passed to `isEnabled` will
-	///         always be identical to the value passed to `execute`, for each
-	///         application of the action.
-	///
-	/// - note: This initializer should only be used if you need to provide
-	///         custom input can also influence whether the action is enabled.
-	///         The various convenience initializers should cover most use cases.
-	///
-	/// - parameters:
-	///   - state: A property that provides the current state of the action
-	///            whenever `apply()` is called.
-	///   - enabledIf: A predicate that, given the current value of `state`,
-	///                returns whether the action should be enabled.
-	///   - execute: A closure that returns the `SignalProducer` returned by
-	///              calling `apply(Input)` on the action, optionally using
-	///              the current value of `state`.
-	init<State: PropertyProtocol>(state property: State, enabledIf isEnabled: @escaping (State.Value) -> Bool, _ execute: @escaping (State.Value, Input) -> SignalProducer<Output, Error>)
-
-	/// Whether the action is currently enabled.
-	var isEnabled: Property<Bool> { get }
-
-	/// Extracts an action from the receiver.
-	var action: Action<Input, Output, Error> { get }
-
-	/// Creates a SignalProducer that, when started, will execute the action
-	/// with the given input, then forward the results upon the produced Signal.
-	///
-	/// - note: If the action is disabled when the returned SignalProducer is
-	///         started, the produced signal will send `ActionError.disabled`,
-	///         and nothing will be sent upon `values` or `errors` for that
-	///         particular signal.
-	///
-	/// - parameters:
-	///   - input: A value that will be passed to the closure creating the signal
-	///            producer.
-	func apply(_ input: Input) -> SignalProducer<Output, ActionError<Error>>
-}
-
-extension Action: ActionProtocol {
-	public var action: Action {
-		return self
-	}
-
+extension Action: BindingTargetProvider {
 	public var bindingTarget: BindingTarget<Input> {
 		return BindingTarget(lifetime: lifetime) { [weak self] in self?.apply($0).start() }
 	}
 }
 
-extension ActionProtocol where Input == Void {
+extension Action where Input == Void {
 	/// Initializes an action that uses an `Optional` property for its input,
 	/// and is disabled whenever the input is `nil`. When executed, a `SignalProducer`
 	/// is created with the current value of the input.
@@ -281,7 +223,7 @@ extension ActionProtocol where Input == Void {
 	///            whenever the value is `nil`.
 	///   - execute: A closure to return a new `SignalProducer` based on the
 	///              current value of `input`.
-	public init<P: PropertyProtocol, T>(input: P, _ execute: @escaping (T) -> SignalProducer<Output, Error>) where P.Value == T? {
+	public convenience init<P: PropertyProtocol, T>(input: P, _ execute: @escaping (T) -> SignalProducer<Output, Error>) where P.Value == T? {
 		self.init(state: input, enabledIf: { $0 != nil }) { input, _ in
 			execute(input!)
 		}
@@ -295,7 +237,7 @@ extension ActionProtocol where Input == Void {
 	///            whenever the action is executed.
 	///   - execute: A closure to return a new `SignalProducer` based on the
 	///              current value of `input`.
-	public init<P: PropertyProtocol, T>(input: P, _ execute: @escaping (T) -> SignalProducer<Output, Error>) where P.Value == T {
+	public convenience init<P: PropertyProtocol, T>(input: P, _ execute: @escaping (T) -> SignalProducer<Output, Error>) where P.Value == T {
 		self.init(input: input.map(Optional.some), execute)
 	}
 }

Sources/Atomic.swift

@@ -11,27 +11,10 @@ import Foundation
 import MachO
 #endif
 
-/// Represents a finite state machine that can transit from one state to
-/// another.
-internal protocol AtomicStateProtocol {
-	associatedtype State: RawRepresentable
-
-	/// Try to transition from the expected current state to the specified next
-	/// state.
-	///
-	/// - parameters:
-	///   - expected: The expected state.
-	///   - next: The state to transition to.
-	///
-	/// - returns:
-	///   `true` if the transition succeeds. `false` otherwise.
-	func tryTransition(from expected: State, to next: State) -> Bool
-}
-
 /// A simple, generic lock-free finite state machine.
 ///
 /// - warning: `deinitialize` must be called to dispose of the consumed memory.
-internal struct UnsafeAtomicState<State: RawRepresentable>: AtomicStateProtocol where State.RawValue == Int32 {
+internal struct UnsafeAtomicState<State: RawRepresentable> where State.RawValue == Int32 {
 	internal typealias Transition = (expected: State, next: State)
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 	private let value: UnsafeMutablePointer<Int32>
@@ -150,7 +133,7 @@ final class PosixThreadMutex: NSLocking {
 }
 
 /// An atomic variable.
-public final class Atomic<Value>: AtomicProtocol {
+public final class Atomic<Value> {
 	private let lock: PosixThreadMutex
 	private var _value: Value
 
@@ -221,7 +204,7 @@ public final class Atomic<Value>: AtomicProtocol {
 
 
 /// An atomic variable which uses a recursive lock.
-internal final class RecursiveAtomic<Value>: AtomicProtocol {
+internal final class RecursiveAtomic<Value> {
 	private let lock: NSRecursiveLock
 	private var _value: Value
 	private let didSetObserver: ((Value) -> Void)?

Sources/Deprecations+Removals.swift

@@ -1,6 +1,19 @@
 import Foundation
 import enum Result.NoError
 
+// MARK: Obsolete types in ReactiveSwift 2.0.
+@available(*, unavailable, message: "This protocol has been removed. Constrain `Action` directly instead.")
+public protocol ActionProtocol {}
+
+@available(*, unavailable, message: "The protocol has been removed. Constrain `Observer` directly instead.")
+public protocol ObserverProtocol {}
+
+@available(*, unavailable, message:"The protocol has been replaced by `BindingTargetProvider`.")
+public protocol BindingTargetProtocol {}
+
+@available(*, unavailable, message:"The protocol has been removed. Constrain `Atomic` directly instead.")
+public protocol AtomicProtocol {}
+
 // MARK: Depreciated types in ReactiveSwift 1.x.
 extension Signal where Value == Bool {
 	@available(*, deprecated, renamed: "negate()")
@@ -32,90 +45,6 @@ public typealias DateSchedulerProtocol = DateScheduler
 @available(*, deprecated, renamed:"BindingSource")
 public typealias BindingSourceProtocol = BindingSource
 
-@available(*, deprecated, message:"The protocol has been replaced by `BindingTargetProvider`, and will be removed in a future version.")
-public protocol BindingTargetProtocol: class, BindingTargetProvider {
-	var lifetime: Lifetime { get }
-
-	func consume(_ value: Value)
-}
-
-extension BindingTargetProtocol {
-	public var bindingTarget: BindingTarget<Value> {
-		return BindingTarget(lifetime: lifetime) { [weak self] in self?.consume($0) }
-	}
-}
-
-extension MutablePropertyProtocol {
-	@available(*, deprecated, message:"Use the regular setter.")
-	public func consume(_ value: Value) {
-		self.value = value
-	}
-}
-
-extension Action: BindingTargetProtocol {
-	@available(*, deprecated, message:"Use the regular SignalProducer.")
-	public func consume(_ value: Input) {
-		self.apply(value).start()
-	}
-}
-
-extension BindingTarget {
-	@available(*, deprecated, renamed:"action")
-	public func consume(_ value: Value) {
-		action(value)
-	}
-
-	@available(*, deprecated, renamed:"init(lifetime:action:)")
-	public init(lifetime: Lifetime, setter: @escaping (Value) -> Void, _ void: Void? = nil) {
-		self.init(lifetime: lifetime, action: setter)
-	}
-
-	@available(*, deprecated, renamed:"init(on:lifetime:action:)")
-	public init(on scheduler: Scheduler, lifetime: Lifetime, setter: @escaping (Value) -> Void, _ void: Void? = nil) {
-		self.init(on: scheduler, lifetime: lifetime, action: setter)
-	}
-}
-
-/// A protocol used to constraint convenience `Atomic` methods and properties.
-@available(*, deprecated, message:"The protocol has been deprecated, and will be removed in a future version.")
-public protocol AtomicProtocol: class {
-	associatedtype Value
-
-	@discardableResult
-	func withValue<Result>(_ action: (Value) throws -> Result) rethrows -> Result
-
-	@discardableResult
-	func modify<Result>(_ action: (inout Value) throws -> Result) rethrows -> Result
-}
-
-extension AtomicProtocol {
-	/// Atomically get or set the value of the variable.
-	public var value: Value {
-		get {
-			return withValue { $0 }
-		}
-
-		set(newValue) {
-			swap(newValue)
-		}
-	}
-
-	/// Atomically replace the contents of the variable.
-	///
-	/// - parameters:
-	///   - newValue: A new value for the variable.
-	///
-	/// - returns: The old value.
-	@discardableResult
-	public func swap(_ newValue: Value) -> Value {
-		return modify { (value: inout Value) in
-			let oldValue = value
-			value = newValue
-			return oldValue
-		}
-	}
-}
-
 // MARK: Removed Types and APIs in ReactiveCocoa 5.0.
 
 // Renamed Protocols
@@ -180,7 +109,7 @@ extension ScopedDisposable {
 	public var innerDisposable: Disposable { fatalError() }
 }
 
-extension ActionProtocol {
+extension Action {
 	@available(*, unavailable, renamed:"isEnabled")
 	public var enabled: Bool { fatalError() }
 
@@ -286,9 +215,7 @@ extension Observer {
 		completed: (() -> Void)? = nil,
 		interrupted: (() -> Void)? = nil
 		) { fatalError() }
-}
 
-extension ObserverProtocol {
 	@available(*, unavailable, renamed: "send(value:)")
 	public func sendNext(_ value: Value) { fatalError() }
 

Sources/Disposable.swift

@@ -28,7 +28,7 @@ private enum DisposableState: Int32 {
 	case disposed
 }
 
-extension AtomicStateProtocol where State == DisposableState {
+extension UnsafeAtomicState where State == DisposableState {
 	/// Try to transition from `active` to `disposed`.
 	///
 	/// - returns: