Merge branch 'master' into binding-target-keypath

Author: andersio

CHANGELOG.md

@@ -3,6 +3,7 @@
 
 1. In Swift 3.2 or later, you may create `BindingTarget` for a key path of a specific object. (#440, kudos to @andersio)
 
+# 2.0.0-alpha.2
 1. In Swift 3.2 or later, you can use `map()` with the new Smart Key Paths. (#435, kudos to @sharplet)
 
 1. When composing `Signal` and `SignalProducer` of inhabitable types, e.g. `Never` or `NoError`, ReactiveSwift now warns about operators that are illogical to use, and traps at runtime when such operators attempt to instantiate an instance. (#429, kudos to @andersio)

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      = "2.0.0-alpha.1"
+  s.version      = "2.0.0-alpha.2"
   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/Scheduler.swift

@@ -136,37 +136,44 @@ public final class UIScheduler: Scheduler {
 	///            begins.
 	@discardableResult
 	public func schedule(_ action: @escaping () -> Void) -> Disposable? {
-		let disposable = AnyDisposable()
-		let actionAndDecrement = {
-			if !disposable.isDisposed {
+		let positionInQueue = enqueue()
+
+		// If we're already running on the main queue, and there isn't work
+		// already enqueued, we can skip scheduling and just execute directly.
+		if positionInQueue == 1 && DispatchQueue.getSpecific(key: UIScheduler.dispatchSpecificKey) == UIScheduler.dispatchSpecificValue {
+			action()
+			dequeue()
+			return nil
+		} else {
+			let disposable = AnyDisposable()
+
+			DispatchQueue.main.async {
+				defer { self.dequeue() }
+				guard !disposable.isDisposed else { return }
 				action()
 			}
 
-			#if os(Linux)
-				self.queueLength.modify { $0 -= 1 }
-			#else
-				OSAtomicDecrement32(self.queueLength)
-			#endif
+			return disposable
 		}
+	}
 
+	private func dequeue() {
 		#if os(Linux)
-			let queued = self.queueLength.modify { value -> Int32 in
-				value += 1
-				return value
-			}
+			queueLength.modify { $0 -= 1 }
 		#else
-			let queued = OSAtomicIncrement32(queueLength)
+			OSAtomicDecrement32(queueLength)
 		#endif
+	}
 
-		// If we're already running on the main queue, and there isn't work
-		// already enqueued, we can skip scheduling and just execute directly.
-		if queued == 1 && DispatchQueue.getSpecific(key: UIScheduler.dispatchSpecificKey) == UIScheduler.dispatchSpecificValue {
-			actionAndDecrement()
-		} else {
-			DispatchQueue.main.async(execute: actionAndDecrement)
+	private func enqueue() -> Int32 {
+		#if os(Linux)
+		return queueLength.modify { value -> Int32 in
+			value += 1
+			return value
 		}
-
-		return disposable
+		#else
+		return OSAtomicIncrement32(queueLength)
+		#endif
 	}
 }
 

script/gen-docs

@@ -66,6 +66,10 @@ cp ../Logo/PNG/logo-Swift.png ${DOC_PATH}/Logo/PNG/logo-Swift.png
 cp ../Logo/PNG/JoinSlack.png ${DOC_PATH}/Logo/PNG/JoinSlack.png
 cp ../Logo/PNG/Docs.png ${DOC_PATH}/Logo/PNG/Docs.png
 
+# Fix all readme links.
+perl -0777 -i -pe 's/"Documentation\/([a-zA-Z0-9-_]+)\.md/"\L$1\.html/g' ${DOC_PATH}/*.html
+perl -0777 -i -pe 's/"(a-zA-Z0-9-_]+)\.md/"\L$1\.html/g' ${DOC_PATH}/*.html
+
 git add ${DOC_PATH}
 
 # Ensure Jekyll is not running in `docs`.
@@ -78,7 +82,7 @@ git add ./reactiveswift/docs/latest
 
 # Update the docset feed.
 rm ./reactiveswift/docs/ReactiveSwift.xml 
-cp ../script/feed.xml.template ./reactiveswift/docs/ReactiveSwift.xml
+/bin/cp -f ../script/feed.xml.template ./reactiveswift/docs/ReactiveSwift.xml
 sed -i -- "s/FRAMEWORK_VERSION/${TRAVIS_TAG}/g" ./reactiveswift/docs/ReactiveSwift.xml
 git add ./reactiveswift/docs/ReactiveSwift.xml