Update ReactiveSwift to 4.0 (#54)

* Update ReactiveSwift to 4.0

* Xcode 9.4: Update to recommended settings

* Make deprecated methods unavailable

* Update .travis.yml

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.4
 before_install: true
 install: true
 branches:
@@ -24,7 +24,7 @@ matrix:
       env:
         - XCODE_SDK=appletvsimulator
         - XCODE_ACTION="build-for-testing test-without-building"
-        - XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
+        - XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV"
     - xcode_scheme: ReactiveObjCBridge-watchOS
       env:
         - XCODE_SDK=watchsimulator

Cartfile

@@ -1,2 +1,2 @@
-github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0
-github "ReactiveCocoa/ReactiveSwift" ~> 3.0.0
+github "ReactiveCocoa/ReactiveObjC" ~> 3.1.0
+github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.2
-github "Quick/Nimble" ~> 7.0.2
+github "Quick/Quick" ~> 1.3
+github "Quick/Nimble" ~> 7.1.3

Cartfile.resolved

@@ -1,6 +1,6 @@
-github "Quick/Nimble" "v7.1.2"
-github "Quick/Quick" "v1.2.0"
+github "Quick/Nimble" "v7.1.3"
+github "Quick/Quick" "v1.3.1"
 github "ReactiveCocoa/ReactiveObjC" "3.1.0"
-github "ReactiveCocoa/ReactiveSwift" "3.1.0"
-github "antitypical/Result" "3.2.4"
+github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "antitypical/Result" "4.0.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

ReactiveObjCBridge.podspec

@@ -22,7 +22,10 @@ Pod::Spec.new do |s|
   s.module_map = 'ReactiveObjCBridge/module.modulemap'
 
   s.dependency 'ReactiveObjC', '~> 3.1'
-  s.dependency 'ReactiveSwift', '~> 3.1'
+  s.dependency 'ReactiveSwift', '~> 4.0'
 
   s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" }
+
+  s.cocoapods_version = ">= 1.4.0"
+  s.swift_version = "4.0"
 end

ReactiveObjCBridge.xcodeproj/project.pbxproj

@@ -619,7 +619,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = GitHub;
 				TargetAttributes = {
 					57A4D1AF1BA13D7A00F7D4B1 = {
@@ -1036,14 +1036,18 @@
 			baseConfigurationReference = D047262919E49FE8006002AA /* Debug.xcconfig */;
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CODE_SIGNING_REQUIRED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_TESTABILITY = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1056,14 +1060,19 @@
 			baseConfigurationReference = D047262B19E49FE8006002AA /* Release.xcconfig */;
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CODE_SIGNING_REQUIRED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1198,13 +1207,17 @@
 			baseConfigurationReference = D047262A19E49FE8006002AA /* Profile.xcconfig */;
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CODE_SIGNING_REQUIRED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1278,13 +1291,17 @@
 			baseConfigurationReference = D047262C19E49FE8006002AA /* Test.xcconfig */;
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CODE_SIGNING_REQUIRED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
@@ -110,8 +110,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
@@ -110,8 +110,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
@@ -110,8 +110,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ReactiveObjCBridge/ObjectiveCBridging.swift

@@ -91,7 +91,7 @@ extension ImmediateScheduler {
 	/// Create `RACScheduler` that performs actions instantly.
 	///
 	/// - returns: `RACScheduler` that instantly performs actions.
-	@available(*, deprecated, message:"Use `RACScheduler.immediate` directly, or `RACScheduler.init` in a generic context.")
+	@available(*, unavailable, message: "Use `RACScheduler.immediate` directly, or `RACScheduler.init` in a generic context.")
 	public func toRACScheduler() -> RACScheduler {
 		return RACScheduler.immediate()
 	}
@@ -101,7 +101,7 @@ extension UIScheduler {
 	/// Create `RACScheduler` for `UIScheduler`
 	///
 	/// - returns: `RACScheduler` instance that queues events on main thread.
-	@available(*, deprecated, message:"Use `RACScheduler.init` to wrap an `UIScheduler` instead.")
+	@available(*, unavailable, message: "Use `RACScheduler.init` to wrap an `UIScheduler` instead.")
 	public func toRACScheduler() -> RACScheduler {
 		return RACScheduler(self)
 	}
@@ -112,7 +112,7 @@ extension QueueScheduler {
 	///
 	/// - returns: Instance `RACScheduler` that queues events on
 	///            `QueueScheduler`'s queue.
-	@available(*, deprecated, message:"Use `RACScheduler.init` to wrap a `QueueScheduler` instead.")
+	@available(*, unavailable, message: "Use `RACScheduler.init` to wrap a `QueueScheduler` instead.")
 	public func toRACScheduler() -> RACScheduler {
 		return RACScheduler(self)
 	}
@@ -324,7 +324,7 @@ extension SignalProducerProtocol where Value: AnyObject {
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACSignal() -> RACSignal<Value> { return bridged }
 }
 
@@ -355,7 +355,7 @@ extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: A
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACSignal() -> RACSignal<Value.Wrapped> { return bridged }
 }
 
@@ -382,7 +382,7 @@ extension SignalProtocol where Value: AnyObject {
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACSignal() -> RACSignal<Value> { return bridged }
 }
 
@@ -413,7 +413,7 @@ extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACSignal() -> RACSignal<Value.Wrapped> { return bridged }
 }
 
@@ -467,7 +467,7 @@ extension Action where Input: AnyObject, Output: AnyObject {
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACCommand() -> RACCommand<Input, Output> { return bridged }
 }
 
@@ -483,7 +483,7 @@ extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACCommand() -> RACCommand<Input.Wrapped, Output> { return bridged }
 }
 
@@ -499,7 +499,7 @@ extension Action where Input: AnyObject, Output: OptionalProtocol, Output.Wrappe
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACCommand() -> RACCommand<Input, Output.Wrapped> { return bridged }
 }
 
@@ -515,7 +515,7 @@ extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output
 		}
 	}
 
-	@available(*, deprecated, message:"Use the `bridged` property instead.")
+	@available(*, unavailable, message: "Use the `bridged` property instead.")
 	public func toRACCommand() -> RACCommand<Input.Wrapped, Output.Wrapped> { return bridged }
 }