Merge branch 'master' into anders/binding-lhs-optional

andersio · web-flow · commit 80d0b8c5963d · 2018-06-25T23:02:09.000+01:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1
+4.1.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode9.4
 before_install: true
 install: true
 branches:
@@ -15,7 +15,7 @@ cache:
 
 jobs:
   include:
-    - osx_image: xcode9.3
+    - osx_image: xcode9.4
       script:
         - XCODE_SCHEME=ReactiveSwift-macOS
           XCODE_SDK=macosx
@@ -42,7 +42,7 @@ jobs:
         - pod lib lint ReactiveSwift.podspec
       env:
         - JOB=PODSPEC
-    - osx_image: xcode9.3
+    - osx_image: xcode9.4
       script:
         - swift --version
         - swift build
@@ -61,6 +61,19 @@ jobs:
         - swift test
       git:
         submodules: false
+    - os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      env: SWIFT_VERSION=4.2-DEVELOPMENT-SNAPSHOT-2018-06-12-a
+      before_install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+      script:
+        - swift --version
+        - swift build
+        - swift test
+      git:
+        submodules: false
     - stage: carthage
       script: carthage build --cache-builds --no-skip-current
     - stage: deploy
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,13 @@
    nilTarget <~ notifications.map { $0.count }
    ```
 
+# 4.0.0-rc.2
+
+1. Support Swift 4.2 (Xcode 10) (#644, kudos to @ikesyo) 
+
+# 4.0.0-rc.1
+
+1. `Lifetime` may now be manually ended using `Lifetime.Token.dispose()`, in addition to the existing when-token-deinitializes semantic. (#641, kudos to @andersio) 
 1. For Swift 4.1 and above, `BindingSource` conformances are required to have `Error` parameterized as exactly `NoError`. As a result, `Signal` and `SignalProducer` are now conditionally `BindingSource`. (#590, kudos to @NachoSoto and @andersio)
 1. For Swift 4.1 and above, `Signal.Event` and `ActionError` are now conditionally `Equatable`. (#590, kudos to @NachoSoto and @andersio)
 1. New method `collect(every:on:skipEmpty:discardWhenCompleted:)` which delivers all values that occurred during a time interval (#619, kudos to @Qata)
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" == 0.12
 github "Quick/Quick" ~> 1.2
-github "Quick/Nimble" ~> 7.0.3
+github "Quick/Nimble" ~> 7.1.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v7.1.1"
+github "Quick/Nimble" "v7.1.2"
 github "Quick/Quick" "v1.3.0"
 github "antitypical/Result" "4.0.0"
 github "jspahrsummers/xcconfigs" "0.12"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
         .package(url: "https://github.com/Quick/Quick.git", from: "1.3.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "7.1.1"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "7.1.2"),
     ],
     targets: [
         .target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),
diff --git a/ReactiveSwift.podspec b/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      = "3.1.0"
+  s.version      = "4.0.0-rc.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.
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/ReactiveCocoa/ReactiveSwift.git", :tag => "#{s.version}" }
   # Directory glob for all Swift files
   s.source_files  = "Sources/*.{swift}"
-  s.dependency 'Result', '~> 3.2'
+  s.dependency 'Result', '~> 4.0'
 
   s.pod_target_xcconfig = {"OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" }
 end
diff --git a/ReactiveSwift.xcodeproj/project.pbxproj b/ReactiveSwift.xcodeproj/project.pbxproj
@@ -636,9 +636,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 57A4D23C1BA13D7A00F7D4B1 /* Build configuration list for PBXNativeTarget "ReactiveSwift-tvOS" */;
 			buildPhases = (
+				57A4D2091BA13D7A00F7D4B1 /* Headers */,
 				57A4D1B01BA13D7A00F7D4B1 /* Sources */,
 				57A4D2071BA13D7A00F7D4B1 /* Frameworks */,
-				57A4D2091BA13D7A00F7D4B1 /* Headers */,
 				57A4D23B1BA13D7A00F7D4B1 /* Resources */,
 			);
 			buildRules = (
@@ -673,9 +673,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = A9B3155D1B3940610001CB9C /* Build configuration list for PBXNativeTarget "ReactiveSwift-watchOS" */;
 			buildPhases = (
+				A9B315511B3940610001CB9C /* Headers */,
 				A9B3154F1B3940610001CB9C /* Sources */,
 				A9B315501B3940610001CB9C /* Frameworks */,
-				A9B315511B3940610001CB9C /* Headers */,
 				A9B315521B3940610001CB9C /* Resources */,
 			);
 			buildRules = (
@@ -691,9 +691,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D047260019E49ED7006002AA /* Build configuration list for PBXNativeTarget "ReactiveSwift-macOS" */;
 			buildPhases = (
+				D04725E719E49ED7006002AA /* Headers */,
 				D04725E519E49ED7006002AA /* Sources */,
 				D04725E619E49ED7006002AA /* Frameworks */,
-				D04725E719E49ED7006002AA /* Headers */,
 				D04725E819E49ED7006002AA /* Resources */,
 			);
 			buildRules = (
@@ -727,9 +727,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D047261F19E49F82006002AA /* Build configuration list for PBXNativeTarget "ReactiveSwift-iOS" */;
 			buildPhases = (
+				D047260919E49F82006002AA /* Headers */,
 				D047260719E49F82006002AA /* Sources */,
 				D047260819E49F82006002AA /* Frameworks */,
-				D047260919E49F82006002AA /* Headers */,
 				D047260A19E49F82006002AA /* Resources */,
 			);
 			buildRules = (
diff --git a/Sources/Flatten.swift b/Sources/Flatten.swift
@@ -436,7 +436,7 @@ extension SignalProducer {
 	///   - previous: A producer to start before `self`.
 	///
 	/// - returns: A signal producer that, when started, first emits values from
-    ///            `previous` producer and then from `self`.
+	///            `previous` producer and then from `self`.
 	public func prefix<Previous: SignalProducerConvertible>(_ previous: Previous) -> SignalProducer<Value, Error> where Previous.Value == Value, Previous.Error == Error {
 		return prefix(previous.producer)
 	}
diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Sources/Lifetime.swift b/Sources/Lifetime.swift
@@ -86,7 +86,8 @@ extension Lifetime {
 }
 
 extension Lifetime {
-	/// A token object which completes its signal when it deinitializes.
+	/// A token object which completes its associated `Lifetime` when
+	/// it deinitializes, or when `dispose()` is called.
 	///
 	/// It is generally used in conjuncion with `Lifetime` as a private
 	/// deinitialization trigger.
@@ -97,15 +98,18 @@ extension Lifetime {
 	/// }
 	/// ```
 	public final class Token {
-		/// A signal that sends a Completed event when the lifetime ends.
 		fileprivate let disposables: CompositeDisposable
 
 		public init() {
 			disposables = CompositeDisposable()
 		}
 
-		deinit {
+		public func dispose() {
 			disposables.dispose()
 		}
+
+		deinit {
+			dispose()
+		}
 	}
 }
diff --git a/Sources/ValidatingProperty.swift b/Sources/ValidatingProperty.swift
@@ -177,47 +177,47 @@ public final class ValidatingProperty<Value, ValidationError: Swift.Error>: Muta
 	) {
 		self.init(MutableProperty(initial), with: other, validator)
 	}
-
-	/// Create a `ValidatingProperty` that presents a mutable validating
-	/// view for an inner mutable property.
+	
+	/// Create a `ValidatingProperty` which validates mutations before
+	/// committing them.
 	///
 	/// The proposed value is only committed when `valid` is returned by the
 	/// `validator` closure.
 	///
 	/// - note: `inner` is retained by the created property.
 	///
 	/// - parameters:
-	///   - inner: The inner property which validated values are committed to.
+	///   - initial: The initial value of the property. It is not required to
+	///              pass the validation as specified by `validator`.
 	///   - other: The property that `validator` depends on.
 	///   - validator: The closure to invoke for any proposed value to `self`.
 	public convenience init<U, E>(
-		_ inner: MutableProperty<Value>,
+		_ initial: Value,
 		with other: ValidatingProperty<U, E>,
 		_ validator: @escaping (Value, U) -> Decision
 	) {
-		self.init(inner, with: other, validator)
+		self.init(MutableProperty(initial), with: other, validator)
 	}
 
-	/// Create a `ValidatingProperty` that validates mutations before
-	/// committing them.
+	/// Create a `ValidatingProperty` that presents a mutable validating
+	/// view for an inner mutable property.
 	///
 	/// The proposed value is only committed when `valid` is returned by the
 	/// `validator` closure.
 	///
 	/// - parameters:
-	///   - initial: The initial value of the property. It is not required to
-	///              pass the validation as specified by `validator`.
+	///   - inner: The inner property which validated values are committed to.
 	///   - other: The property that `validator` depends on.
 	///   - validator: The closure to invoke for any proposed value to `self`.
 	public convenience init<U, E>(
-		_ initial: Value,
+		_ inner: MutableProperty<Value>,
 		with other: ValidatingProperty<U, E>,
 		_ validator: @escaping (Value, U) -> Decision
 	) {
 		// Capture only `other.result` but not `other`.
 		let otherValidations = other.result
 
-		self.init(initial) { input in
+		self.init(inner) { input in
 			let otherValue: U
 
 			switch otherValidations.value {
diff --git a/Tests/ReactiveSwiftTests/FlattenSpec.swift b/Tests/ReactiveSwiftTests/FlattenSpec.swift
@@ -645,22 +645,34 @@ class FlattenSpec: QuickSpec {
 					.flatMap(.latest) { _ in Property(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap arbitrary error signal to arbitrary error signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with explicit inner value and error type parameters, given an upstream of arbitrary error type") {
 				_ = Signal<Int, TestError>.empty
 					.flatMap(.latest) { _ in .init(result: Result<Int, TestError>(error: .default)) }
 			}
 
-			it("sould available to use contextual lookup for flatMap NoError signal to NoError signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with implicit error type parameter") {
 				_ = Signal<Int, NoError>.empty
 					.flatMap(.latest) { _ in .init(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap arbitrary error signal and NoError signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with implicit error type parameter") {
 				_ = Signal<Int, TestError>.empty
 					.flatMap(.latest) { _ in .init(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap NoError signal to arbitrary error signal") {
+// NOTE: These test cases were disabled as the Swift 4.2 type checker apparently
+// cannot infer the type paramaters when both are absent.
+//			it("should be able to fallback to SignalProducer for contextual lookups without explicit inner value and error type parameters") {
+//				_ = Signal<Int, NoError>.empty
+//					.flatMap(.latest) { _ in .empty }
+//			}
+//
+//			it("should be able to fallback to SignalProducer for contextual lookups without explicit inner value and error type parameters") {
+//				_ = Signal<Int, TestError>.empty
+//					.flatMap(.latest) { _ in .empty }
+//			}
+
+			it("should be able to fallback to SignalProducer for contextual lookups with explicit inner and error type parameters, given a NoError upstream") {
 				_ = Signal<Int, NoError>.empty
 					.flatMap(.latest) { _ in .init(result: Result<Int, TestError>(error: .default)) }
 			}
@@ -835,22 +847,34 @@ class FlattenSpec: QuickSpec {
 					.flatMap(.latest) { _ in Property(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap arbitrary error signal to arbitrary error signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with explicit inner value and error type parameters, given an upstream of arbitrary error type") {
 				_ = SignalProducer<Int, TestError>.empty
 					.flatMap(.latest) { _ in .init(error: .default) } as SignalProducer<Int, TestError>
 			}
 
-			it("sould available to use contextual lookup for flatMap NoError signal to NoError signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with implicit inner error type parameter") {
 				_ = SignalProducer<Int, NoError>.empty
 					.flatMap(.latest) { _ in .init(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap arbitrary error signal to NoError signal") {
+			it("should be able to fallback to SignalProducer for contextual lookups with implicit inner error type parameter") {
 				_ = SignalProducer<Int, TestError>.empty
 					.flatMap(.latest) { _ in .init(value: 0) }
 			}
 
-			it("sould available to use contextual lookup for flatMap NoError signal to arbitrary error signal") {
+// NOTE: These test cases were disabled as the Swift 4.2 type checker apparently
+// cannot infer the type paramaters when both are absent.
+//			it("should be able to fallback to SignalProducer for contextual lookups without explicit inner value and error type parameters") {
+//				_ = SignalProducer<Int, NoError>.empty
+//					.flatMap(.latest) { _ in .empty }
+//			}
+//
+//			it("should be able to fallback to SignalProducer for contextual lookups without explicit inner value and error type parameters") {
+//				_ = SignalProducer<Int, TestError>.empty
+//					.flatMap(.latest) { _ in .empty }
+//			}
+
+			it("should be able to fallback to SignalProducer for contextual lookups with explicit inner and error type parameters, given a NoError upstream.") {
 				_ = SignalProducer<Int, NoError>.empty
 					.flatMap(.latest) { _ in .init(error: .default) } as SignalProducer<Int, TestError>
 			}
@@ -1139,7 +1163,7 @@ class FlattenSpec: QuickSpec {
 				expect(completed) == true
 			}
 
-			it("sould available to use contextual lookup") {
+			it("should be able to fallback to SignalProducer for contextual lookups") {
 				_ = SignalProducer<Int, NoError>.empty
 					.merge(with: .init(value: 0))
 			}
@@ -1206,7 +1230,7 @@ class FlattenSpec: QuickSpec {
 				expect(lastValue) == 3
 			}
 
-			it("sould available to use contextual lookup") {
+			it("should be able to fallback to SignalProducer for contextual lookups") {
 				_ = SignalProducer<Int, NoError>.empty
 					.prefix(.init(value: 0))
 			}
@@ -1310,7 +1334,7 @@ class FlattenSpec: QuickSpec {
 				expect(results[0].error) == .error1
 			}
 
-			it("sould available to use contextual lookup") {
+			it("should be able to fallback to SignalProducer for contextual lookups") {
 				_ = SignalProducer<Int, NoError>.empty
 					.concat(.init(value: 0))
 			}
diff --git a/Tests/ReactiveSwiftTests/Info.plist b/Tests/ReactiveSwiftTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Tests/ReactiveSwiftTests/LifetimeSpec.swift b/Tests/ReactiveSwiftTests/LifetimeSpec.swift
diff --git a/Tests/ReactiveSwiftTests/PropertySpec.swift b/Tests/ReactiveSwiftTests/PropertySpec.swift
diff --git a/Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift b/Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift
diff --git a/Tests/ReactiveSwiftTests/SignalProducerSpec.swift b/Tests/ReactiveSwiftTests/SignalProducerSpec.swift
diff --git a/Tests/ReactiveSwiftTests/SignalSpec.swift b/Tests/ReactiveSwiftTests/SignalSpec.swift

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ extension SignalProducer {`
`436`	`436`	/// - previous: A producer to start before `self`.
`437`	`437`	`///`
`438`	`438`	`/// - returns: A signal producer that, when started, first emits values from`
`439`		- /// `previous` producer and then from `self`.
	`439`	+ /// `previous` producer and then from `self`.
`440`	`440`	`public func prefix<Previous: SignalProducerConvertible>(_ previous: Previous) -> SignalProducer<Value, Error> where Previous.Value == Value, Previous.Error == Error {`
`441`	`441`	`return prefix(previous.producer)`
`442`	`442`	`}`