Swift4.0

.swift-version

@@ -1 +1 @@
-3.0.1
+4.0

.travis.yml

@@ -1,6 +1,6 @@
 os: osx
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9
 
 script: 
   - set -o pipefail

Action.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Action"
-  s.version      = "3.2.0"
+  s.version      = "3.3.0-alpha.1"
   s.summary      = "Abstracts actions to be performed in RxSwift."
   s.description  = <<-DESC
     Encapsulates an action to be performed, usually by a button press, but also useful to pass actions to execute later
@@ -16,12 +16,12 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '2.0'
   s.tvos.deployment_target = '9.0'
 
-  s.source       = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version }
+  s.source       = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*.{swift}"
 
   s.frameworks  = "Foundation"
-  s.dependency "RxSwift", "~> 3.4"
-  s.dependency "RxCocoa", "~> 3.4"
+  s.dependency "RxSwift", "~> 4.0.0-alpha.1"
+  s.dependency "RxCocoa", "~> 4.0.0-alpha.1"
 
   s.watchos.exclude_files = "Control+Action.swift", "Button+Action.swift", "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
   s.osx.exclude_files = "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"

Action.xcodeproj/project.pbxproj

@@ -1088,7 +1088,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1134,7 +1134,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

Action.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0830"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
+               BuildableName = "Demo.app"
+               BlueprintName = "Demo"
+               ReferencedContainer = "container:Action.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Action.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Action.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Action.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 3.4
+github "ReactiveX/RxSwift" "4.0.0-alpha.1"

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v6.1.0"
+github "Quick/Nimble" "v7.0.1"
 github "Quick/Quick" "v1.1.0"
-github "ReactiveX/RxSwift" "3.4"
+github "ReactiveX/RxSwift" "4.0.0-alpha.1"

Package.swift

@@ -4,7 +4,8 @@ let package = Package(
     name: "Action",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 4)
-    ]
+        .Package(url: "https://github.com/ReactiveX/RxSwift.git", Version(4, 0, 0, prereleaseIdentifiers: ["alpha.1"]))
+    ],
+    exclude: ["Tests/"]
 )
 

Sources/Action/Action.swift

@@ -66,7 +66,7 @@ public final class Action<Input, Element> {
         errors = errorsSubject.asObservable()
 
         executionObservables = inputs
-            .withLatestFrom(enabled) { $0 }
+            .withLatestFrom(enabled) { input, enabled in (input, enabled) }
             .flatMap { input, enabled -> Observable<Observable<Element>> in
                 if enabled {
                     return Observable.of(workFactory(input)

Sources/Action/UIKitExtensions/UIAlertAction+Action.swift

@@ -7,7 +7,7 @@ public extension UIAlertAction {
 
     public static func Action(_ title: String?, style: UIAlertActionStyle) -> UIAlertAction {
         return UIAlertAction(title: title, style: style, handler: { action in
-            action.rx.action?.execute()
+            action.rx.action?.execute(())
             return
         })
     }

Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift

@@ -30,8 +30,8 @@ public extension Reactive where Base: UIBarButtonItem {
                     .bind(to: self.isEnabled)
                     .disposed(by: self.base.actionDisposeBag)
 
-                self.tap.subscribe(onNext: { (_) in
-                    action.execute()
+                self.tap.subscribe(onNext: {
+                    action.execute(())
                 })
                 .disposed(by: self.base.actionDisposeBag)
             }

Tests/iOS-Tests/AlertActionTests.swift

@@ -34,7 +34,7 @@ class AlertActionTests: QuickSpec {
 
             subject.rx.action = action
 
-            action.execute()
+            action.execute(())
             expect(subject.isEnabled).toEventually( beFalse() )
 
             observer.onCompleted()

Tests/iOS-Tests/BarButtonTests.swift

@@ -35,7 +35,7 @@ class BarButtonTests: QuickSpec {
 
 			subject.rx.action = action
 
-			action.execute()
+			action.execute(())
 			expect(subject.isEnabled).toEventually( beFalse() )
 
 			observer.onCompleted()

Tests/iOS-Tests/ButtonTests.swift

@@ -35,7 +35,7 @@ class ButtonTests: QuickSpec {
 
             subject.rx.action = action
 
-            action.execute()
+            action.execute(())
             expect(subject.isEnabled).toEventually( beFalse() )
 
             observer.onCompleted()
@@ -123,7 +123,7 @@ class ButtonTests: QuickSpec {
                     }
 
                     subject.rx.action = action
-                    subject.rx.action?.execute()
+                    subject.rx.action?.execute(())
                 }
             }