Merge remote-tracking branch 'upstream/master' into UIFeedbackGenerator

Author: Marcocanc

.swift-version

@@ -25,8 +25,7 @@ matrix:
       env:
         - XCODE_SDK=iphonesimulator
         - XCODE_ACTION="build-for-testing test-without-building"
-        - XCODE_DESTINATION="platform=iOS Simulator,id=31E6604A-19AA-4B68-B560-C33C584BC80D" # iPhone 6s, iOS 10.2
-#        - XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=10.2"
+        - XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=10.2"
 #        - XCODE_PLAYGROUND_TARGET="x86_64-apple-ios9.3"
 #        - PLAYGROUND="ReactiveCocoa-iOS.playground"
     - xcode_scheme: ReactiveCocoa-tvOS
@@ -40,7 +39,7 @@ matrix:
       env:
         - XCODE_SDK=watchsimulator
         - XCODE_ACTION=build
-        - XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
+        - XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm,OS=2.2"
     - script:
         - carthage build --no-skip-current --platform mac
       env:

.travis.yml

@@ -257,6 +257,9 @@
 		CD0C45DF1CC9A288009F5BF0 /* DynamicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD0C45DD1CC9A288009F5BF0 /* DynamicProperty.swift */; };
 		CD0C45E01CC9A288009F5BF0 /* DynamicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD0C45DD1CC9A288009F5BF0 /* DynamicProperty.swift */; };
 		CD0C45E11CC9A288009F5BF0 /* DynamicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD0C45DD1CC9A288009F5BF0 /* DynamicProperty.swift */; };
+		CD42C69B1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD42C69A1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift */; };
+		CD42C69C1E951F6A00AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD42C69A1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift */; };
+		CD42C69D1E951F6A00AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD42C69A1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift */; };
 		CD8401831CEE8ED7009F0ABF /* CocoaActionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8401821CEE8ED7009F0ABF /* CocoaActionSpec.swift */; };
 		CD8401841CEE8ED7009F0ABF /* CocoaActionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8401821CEE8ED7009F0ABF /* CocoaActionSpec.swift */; };
 		CD8401851CEE8ED7009F0ABF /* CocoaActionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8401821CEE8ED7009F0ABF /* CocoaActionSpec.swift */; };
@@ -468,6 +471,7 @@
 		BFCF77601DFAD9120058006E /* UISearchBarSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UISearchBarSpec.swift; sourceTree = "<group>"; };
 		BFE145881E43991A00208736 /* UIPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIPickerView.swift; sourceTree = "<group>"; };
 		CD0C45DD1CC9A288009F5BF0 /* DynamicProperty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicProperty.swift; sourceTree = "<group>"; };
+		CD42C69A1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveCocoaTestsConfiguration.swift; sourceTree = "<group>"; };
 		CD8401821CEE8ED7009F0ABF /* CocoaActionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CocoaActionSpec.swift; sourceTree = "<group>"; };
 		CDC42E2E1AE7AB8B00965373 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D03766B119EDA60000A782A9 /* test-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "test-data.json"; sourceTree = "<group>"; };
@@ -828,6 +832,7 @@
 				9ADFE5A01DBFFBCF001E11F7 /* LifetimeSpec.swift */,
 				9A24A8431DE1429600987AF9 /* SwizzlingSpec.swift */,
 				3B30EE8B1E7BE529007CC8EF /* DeprecationsSpec.swift */,
+				CD42C69A1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift */,
 				D04725FA19E49ED7006002AA /* Supporting Files */,
 			);
 			path = ReactiveCocoaTests;
@@ -1265,6 +1270,7 @@
 				9A1D063B1D93EA7E00ACF44C /* UIButtonSpec.swift in Sources */,
 				9A24A8471DE142A600987AF9 /* SwizzlingSpec.swift in Sources */,
 				9A1D064B1D93EA7E00ACF44C /* UISegmentedControlSpec.swift in Sources */,
+				CD42C69D1E951F6A00AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */,
 				9A1D063F1D93EA7E00ACF44C /* UIControl+EnableSendActionsForControlEvents.swift in Sources */,
 				9A1D06371D93EA7E00ACF44C /* UIActivityIndicatorViewSpec.swift in Sources */,
 				9A6AAA2F1DB903A40013AAEA /* ReusableComponentsSpec.swift in Sources */,
@@ -1374,6 +1380,7 @@
 				CD8401831CEE8ED7009F0ABF /* CocoaActionSpec.swift in Sources */,
 				9A9DFEE91DA7EFB60039EE1B /* AssociationSpec.swift in Sources */,
 				3B30EE8C1E7BE529007CC8EF /* DeprecationsSpec.swift in Sources */,
+				CD42C69B1E951F6900AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */,
 				9A1E72BA1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */,
 				4ABEFE2E1DCFD01F0066A8C2 /* NSTableViewSpec.swift in Sources */,
 			);
@@ -1462,6 +1469,7 @@
 				9A892D901E8D19BE00EA35F3 /* DelegateProxySpec.swift in Sources */,
 				531866FA1DD7925600D1285F /* UIStepperSpec.swift in Sources */,
 				9A1D06361D93EA7E00ACF44C /* UIActivityIndicatorViewSpec.swift in Sources */,
+				CD42C69C1E951F6A00AA9504 /* ReactiveCocoaTestsConfiguration.swift in Sources */,
 				9A1D06461D93EA7E00ACF44C /* UILabelSpec.swift in Sources */,
 				3B30EE8D1E7BE529007CC8EF /* DeprecationsSpec.swift in Sources */,
 				9A9DFEEA1DA7EFB60039EE1B /* AssociationSpec.swift in Sources */,

ReactiveCocoa.xcodeproj/project.pbxproj

@@ -264,7 +264,7 @@ internal struct PropertyAttributes {
 		let _next = NSGetSizeAndAlignment(typeString, nil, nil)
 		guard _next != typeString else {
 			let string = String(validatingUTF8: attrString)
-			preconditionFailure("Could not read past type in attribute string: \(string).")
+			preconditionFailure("Could not read past type in attribute string: \(String(describing: string)).")
 		}
 		var next = UnsafeMutablePointer<Int8>(mutating: _next)
 
@@ -355,7 +355,7 @@ internal struct PropertyAttributes {
 
 			case Code.Attribute.oldTypeEncoding:
 				let string = String(validatingUTF8: attrString)
-				assertionFailure("Old-style type encoding is unsupported in attribute string \"\(string)\"")
+				assertionFailure("Old-style type encoding is unsupported in attribute string \"\(String(describing: string))\"")
 
 				// skip over this type encoding
 				while next.pointee != Code.comma && next.pointee != Code.nul {
@@ -369,14 +369,14 @@ internal struct PropertyAttributes {
 
 				let flag = String(validatingUTF8: pointer)
 				let string = String(validatingUTF8: attrString)
-				preconditionFailure("ERROR: Unrecognized attribute string flag '\(flag)' in attribute string \"\(string)\".")
+				preconditionFailure("ERROR: Unrecognized attribute string flag '\(String(describing: flag))' in attribute string \"\(String(describing: string))\".")
 			}
 		}
 
 		if next.pointee != Code.nul {
 			let unparsedData = String(validatingUTF8: next)
 			let string = String(validatingUTF8: attrString)
-			assertionFailure("Warning: Unparsed data \"\(unparsedData)\" in attribute string \"\(string)\".")
+			assertionFailure("Warning: Unparsed data \"\(String(describing: unparsedData))\" in attribute string \"\(String(describing: string))\".")
 		}
 
 		self.objectClass = objectClass

ReactiveCocoa/NSObject+KeyValueObserving.swift

@@ -8,6 +8,10 @@ import CoreGraphics
 
 class InterceptingSpec: QuickSpec {
 	override func spec() {
+		beforeSuite {
+			ForwardInvocationTestObject._initialize()
+		}
+
 		describe("trigger(for:)") {
 			var object: InterceptedObject!
 			weak var _object: InterceptedObject?
@@ -830,36 +834,28 @@ private class ForwardInvocationTestObject: InterceptedObject {
 	var forwardedCount = 0
 	var forwardedSelector: Selector?
 
-	override open class func initialize() {
-		struct Static {
-			static var token: Int = {
-				let impl: @convention(c) (Any, Selector, AnyObject) -> Void = { object, _, invocation in
-					let object = object as! ForwardInvocationTestObject
-					object.forwardedCount += 1
-					object.forwardedSelector = invocation.selector
-				}
-
-				let success = class_addMethod(ForwardInvocationTestObject.self,
-				                ObjCSelector.forwardInvocation,
-				                unsafeBitCast(impl, to: IMP.self),
-				                ObjCMethodEncoding.forwardInvocation)
-
-				assert(success)
-				assert(ForwardInvocationTestObject.instancesRespond(to: ObjCSelector.forwardInvocation))
+	fileprivate static func _initialize() {
+		let impl: @convention(c) (Any, Selector, AnyObject) -> Void = { object, _, invocation in
+			let object = object as! ForwardInvocationTestObject
+			object.forwardedCount += 1
+			object.forwardedSelector = invocation.selector
+		}
 
-				let success2 = class_addMethod(ForwardInvocationTestObject.self,
-				                               ForwardInvocationTestObject.forwardedSelector,
-				                               _rac_objc_msgForward,
-				                               ObjCMethodEncoding.forwardInvocation)
+		let success = class_addMethod(ForwardInvocationTestObject.self,
+		                              ObjCSelector.forwardInvocation,
+		                              unsafeBitCast(impl, to: IMP.self),
+		                              ObjCMethodEncoding.forwardInvocation)
 
-				assert(success2)
-				assert(ForwardInvocationTestObject.instancesRespond(to: ForwardInvocationTestObject.forwardedSelector))
+		assert(success)
+		assert(ForwardInvocationTestObject.instancesRespond(to: ObjCSelector.forwardInvocation))
 
-				return 0
-			}()
-		}
+		let success2 = class_addMethod(ForwardInvocationTestObject.self,
+		                               ForwardInvocationTestObject.forwardedSelector,
+		                               _rac_objc_msgForward,
+		                               ObjCMethodEncoding.forwardInvocation)
 
-		_ = Static.token
+		assert(success2)
+		assert(ForwardInvocationTestObject.instancesRespond(to: ForwardInvocationTestObject.forwardedSelector))
 	}
 }
 

ReactiveCocoaTests/InterceptingSpec.swift

@@ -0,0 +1,14 @@
+import Quick
+#if os(iOS) || os(tvOS)
+import UIKit
+#endif
+
+class ReactiveCocoaTestsConfiguration: QuickConfiguration {
+	override class func configure(_ configuration: Configuration) {
+		#if os(iOS) || os(tvOS)
+			configuration.beforeSuite {
+				UIControl._initialize()
+			}
+		#endif
+	}
+}

ReactiveCocoaTests/ReactiveCocoaTestsConfiguration.swift

@@ -11,7 +11,7 @@ public func sendValues<T: Equatable, E: Equatable>(_ values: [T], sendError mayb
 	return NonNilMatcherFunc { actualExpression, failureMessage in
 		precondition(maybeSendError == nil || !complete, "Signals can't both send an error and complete")
 
-		failureMessage.postfixMessage = "Send values \(values). Send error \(maybeSendError). Complete: \(complete)"
+		failureMessage.postfixMessage = "Send values \(values). Send error \(String(describing: maybeSendError)). Complete: \(complete)"
 		let maybeProducer = try actualExpression.evaluate()
 
 		if let signalProducer = maybeProducer {

ReactiveCocoaTests/SignalProducerNimbleMatchers.swift

@@ -1,6 +1,6 @@
 import UIKit
 
-private let rac_swizzleToken: Void = {
+private func rac_swizzle() {
 	let originalSelector = #selector(UIControl.sendAction(_:to:for:))
 	let swizzledSelector = #selector(UIControl.rac_sendAction(_:to:forEvent:))
 
@@ -20,22 +20,16 @@ private let rac_swizzleToken: Void = {
 	} else {
 		method_exchangeImplementations(originalMethod, swizzledMethod)
 	}
-
-	return ()
-}()
+}
 
 /// Unfortunately, there's an apparent limitation in using `sendActionsForControlEvents`
 /// on unit-tests for any control besides `UIButton` which is very unfortunate since we
 /// want test our bindings for `UIDatePicker`, `UISwitch`, `UITextField` and others
 /// in the future. To be able to test them, we're now using swizzling to manually invoke
 /// the pair target+action.
 extension UIControl {
-	override open class func initialize() {
-		guard self === UIControl.self else {
-			return
-		}
-
-		_ = rac_swizzleToken
+	static func _initialize() {
+		rac_swizzle()
 	}
 
 	// MARK: - Method Swizzling

ReactiveCocoaTests/UIKit/UIControl+EnableSendActionsForControlEvents.swift

@@ -25,7 +25,7 @@ class UIDatePickerSpec: QuickSpec {
 		}
 
 		it("should accept changes from bindings to its date value") {
-			picker.reactive.date.consume(date)
+			picker.reactive.date.action(date)
 			expect(picker.date) == date
 		}