RxSwiftCommunity · Donnadonnam · Apr 22, 2019 · Apr 22, 2019 · Apr 23, 2019 · Apr 23, 2019
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  xcode:
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+        swift: [5.0, 4.2]
+      fail-fast: false
+    name: Action Tests (Swift ${{ matrix.swift }})
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache Carthage
+        uses: actions/cache@v2
+        with:
+          path: Carthage
+          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-carthage-
+      - name: Bootstrap Carthage
+        run: carthage bootstrap --no-use-binaries --cache-builds
+      - name: Tests
+        run: |
+          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action -destination "platform=iOS Simulator,name=iPhone 11" | xcpretty -c --test
+          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-macOS -destination "arch=x86_64" | xcpretty -c --test
+      - name: Builds
+        run: |
+          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-watchOS -destination "platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm" | xcpretty -c
+          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-tvOS -destination "platform=tvOS Simulator,name=Apple TV 4K (at 1080p)" | xcpretty -c
diff --git a/.swift-version b/.swift-version
diff --git a/Action.podspec b/Action.podspec
@@ -1,27 +1,29 @@
 Pod::Spec.new do |s|
   s.name         = "Action"
-  s.version      = "3.11.0"
+  s.version      = "5.0.0"
   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
 	(once or multiple times) without having to expose other objects.
                    DESC
   s.homepage     = "https://github.com/RxSwiftCommunity/Action"
   s.license      = { :type => "MIT", :file => "License.md" }
-  s.author             = { "Ash Furrow" => "[email protected]" }
+  s.author             = { "RxSwift Community" => "[email protected]" }
   s.social_media_url   = "http://twitter.com/ashfurrow"
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'
   s.watchos.deployment_target = '3.0'
   s.tvos.deployment_target = '9.0'
 
   s.source       = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*.{swift}"
 
+  s.swift_version   =   '5.0'
+
   s.frameworks  = "Foundation"
-  s.dependency "RxSwift", "~> 4.0"
-  s.dependency "RxCocoa", "~> 4.0"
+  s.dependency "RxSwift", '~> 6.0'
+  s.dependency "RxCocoa", '~> 6.0'
 
   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"

diff --git a/Action.xcodeproj/project.pbxproj b/Action.xcodeproj/project.pbxproj
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.4.2
+github "ReactiveX/RxSwift" >= 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.1"
-github "Quick/Quick" "v2.0.0"
-github "ReactiveX/RxSwift" "4.4.2"
+github "Quick/Nimble" "v9.0.0"
+github "Quick/Quick" "v3.1.2"
+github "ReactiveX/RxSwift" "6.1.0"
diff --git a/Changelog.md b/Changelog.md
@@ -1,187 +1 @@
-Changelog
-=========
-
-
-Current master
---------------
-3.11.0
--------
-- Introduction of  `underlyingError` observable which returns a `Swift.Error`  element type. 
-- Updated specs that were breaking in `Circle CI` pipeline 
-
-3.10.2
--------
-- Update the project and xcworkspace and make it compatible with Version 10.1 (10B61)
-- Update the Unit test target and make it compatible with Version 10.1 (10B61)
-- Moved CI to circle CI 2.0
-- Fix issue [#155](https://github.com/RxSwiftCommunity/Action/issues/155)
-- Fix issue [#179](https://github.com/RxSwiftCommunity/Action/issues/179)
-
-3.10.0
--------
-- Adding syntax sugar `execute()` method on `Action` when `Input` is `Void`. [#171](https://github.com/RxSwiftCommunity/Action/pull/171)
-- Raises minimum watchOS deployment target to 3.0, to match RxSwift.
-
-3.9.1
------
-
-- Less restrictive RxSwift/RxCocoa dependencies in podspec, now supporting RxSwift/RxCocoa 4.x starting with version 4.3
-
-3.9.0
------
-- Fix Action Demo build failure
-- Added missing support for Swift 4.2 after 3.7.0
-
-
-3.8.0
------
-
-- Fix build failure on New Build System (default on Xcode 10) [#151](https://github.com/RxSwiftCommunity/Action/pull/151)
-
-3.7.0
------
-- Added full support for Swift 4.2
-- Added full support for RxSwift 4.3
-
-3.6.0
------
-- Updated `Semantic Versioning` to reflect what is actaully released both on `Pod`  and `Carthage`
-- Added full support for Swift 4.1
-- Added full support for RxSwift 4.2.0
-- UIRefreshControl support: binding to an action (or CocoaAction) starts the action itself and updates the control's refreshing status
-
-3.5.0
------
-
-- Add convenience initializer with work factories returning `PrimitiveSequence` or any other `ObservableConvertibleType` [#125](https://github.com/RxSwiftCommunity/Action/pull/125)
-- Introduce `CompletableAction`, a typealias for action that only completes without emitting any elements [#125](https://github.com/RxSwiftCommunity/Action/pull/125)
-
-3.4.0
------
-- Added full support for Swift 4.0
-- Added full support for RxSwift 4.0.0
-- Preserved old behavior for `shareReplay(1)` api changes from `RxSwift`. [#110](https://github.com/RxSwiftCommunity/Action/pull/110)
-
-
-Version table
--------------
-
-| Swift version | RxSwift version | Action version |
-| ------------- | --------------- | -------------- |
-| Swift 3.0     | v3.2.*   	      | v2.2.0 		   |
-| Swift 3.2     | v3.6.*   	      | v3.2.0 		   |
-| **Swift 4**   | **v4.0.0**      | **v3.4.0**     |
-| Swift 4.1    | **v4.2.0**      | **v3.6.0**     |
-
-3.2.0
------
-- Add macOS bindings for NSControl and NSButton
-
-3.1.1
------
-
-- Loosens dependency on RxSwift.
-
-3.1.0
------
-
-- Replace `PublishSubject` with `InputSubject` [#92](https://github.com/RxSwiftCommunity/Action/pull/92)
-- Added missing sources for watchOS target [#95](https://github.com/RxSwiftCommunity/Action/pull/95)
-
-3.0.0
------
-
-- Change `bindTo([...])` methods to `bind(to: [...])` to better align with the revised Rx API
-- Update Rx invocations to resolve deprecation warnings related to same
-
-2.2.2
------
-
-- Remove `RxBlocking` from Linked Libraries in `Action` target
-
-2.2.1
------
-
-- Loosens dependency on RxSwift.
-
-2.2.0
------
-
-- Fixes [#63](https://github.com/RxSwiftCommunity/Action/issues/63), related to the default enabled state.
-- Adds `bindTo(action:)` for non-CocoaAction.
-
-2.1.1
------
-
-- Not replay `executionObservables` to fix `execute(_:)`. See [#64](https://github.com/RxSwiftCommunity/Action/pull/56).
-
-2.1.0
------
-
-- Refactors internal implementation. See [#56](https://github.com/RxSwiftCommunity/Action/pull/56) and [#59](https://github.com/RxSwiftCommunity/Action/pull/59).
-- Adds SwiftPM support. See [#58](https://github.com/RxSwiftCommunity/Action/pull/58).
-
-2.0.0-beta.1
-------------
-
-- Adds Swift 3 support. See [#46](https://github.com/RxSwiftCommunity/Action/pull/46).
-
-1.2.2
------
-
-- Added inputs subject to trigger actins by observables. See [#37](https://github.com/RxSwiftCommunity/Action/pull/37).
-- Fixes a problem with observable deallocation related to `rx_action` button property. See [#33](https://github.com/RxSwiftCommunity/Action/pull/33).
-- Improved Carthage compatibility. See [#34](https://github.com/RxSwiftCommunity/Action/pull/34).
-- Swift 2.3 support.
-
-1.2.1
------
-
-- Relaxes dependency requirements.
-
-1.2.0
------
-
-- Updates to RxSwift 2.1.0.
-
-1.1.0
------
-
-- Transitioned podspec to new remote URL (see [#15](https://github.com/RxSwiftCommunity/Action/issues/15)).
-- Moved to RxSwift 2.0 🎉
-
-1.2.2
------
-
-- Fixes memory leak when used on buttons. See [#21](https://github.com/RxSwiftCommunity/Action/issues/21).
-
-1.2.1
------
-
-- Relaxes dependency requirements.
-
-1.0.0
------
-
-- Unbounded replaying of event values (see [#3](https://github.com/ashfurrow/Action/issues/3)).
-
-0.3.0
------
-
-Added `UIAlertAction` support.
-
-0.2.1
------
-
-- Fixes `enabledIf:` parameter to be `Observable<B>`, `where B: BooleanType`.
-
-0.2.0
------
-
-- Added tvOS support to UIButton extension.
-- Changes `enabledIf` to accept `Observable<BooleanType>` instead of `Bool`.
-
-0.1.0
------
-
-- Initial release.
+#  
diff --git a/Demo/Base.lproj/Main.storyboard b/Demo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gBp-2p-Zj2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gBp-2p-Zj2">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -48,8 +48,8 @@
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="OrY-7C-i77">
-                                <rect key="frame" x="290" y="496" width="20" height="20"/>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="OrY-7C-i77">
+                                <rect key="frame" x="177.5" y="563" width="20" height="20"/>
                             </activityIndicatorView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rn7-U4-1tI">
                                 <rect key="frame" x="131" y="107" width="113" height="30"/>

diff --git a/Demo/ViewController.swift b/Demo/ViewController.swift
@@ -29,7 +29,7 @@ class ViewController: UIViewController {
     var disposableBag = DisposeBag()
     let sharedAction = Action<SharedInput, String> { input in
         switch input {
-        case .barButton: return Observable.just("UIBarButtonItem with 3 seconds delay").delaySubscription(3, scheduler: MainScheduler.instance)
+        case .barButton: return Observable.just("UIBarButtonItem with 3 seconds delay").delaySubscription(.seconds(3), scheduler: MainScheduler.instance)
         case .button(let title): return .just("UIButton " + title)
         }
     }
@@ -39,20 +39,20 @@ class ViewController: UIViewController {
 
         // Demo: add an action to a button in the view
         let action = CocoaAction {
-			print("Button was pressed, showing an alert and keeping the activity indicator spinning while alert is displayed")
+            print("Button was pressed, showing an alert and keeping the activity indicator spinning while alert is displayed")
             return Observable.create { [weak self] observer -> Disposable in
-				// Demo: show an alert and complete the view's button action once the alert's OK button is pressed
-				let alertController = UIAlertController(title: "Hello world", message: "This alert was triggered by a button action", preferredStyle: .alert)
-				var ok = UIAlertAction.Action("OK", style: .default)
-				ok.rx.action = CocoaAction {
-					print("Alert's OK button was pressed")
-					observer.onCompleted()
-					return .empty()
-				}
-				alertController.addAction(ok)
-				self?.present(alertController, animated: true, completion: nil)
+                // Demo: show an alert and complete the view's button action once the alert's OK button is pressed
+                let alertController = UIAlertController(title: "Hello world", message: "This alert was triggered by a button action", preferredStyle: .alert)
+                var ok = UIAlertAction.Action("OK", style: .default)
+                ok.rx.action = CocoaAction {
+                    print("Alert's OK button was pressed")
+                    observer.onCompleted()
+                    return .empty()
+                }
+                alertController.addAction(ok)
+                self?.present(alertController, animated: true, completion: nil)
 
-				return Disposables.create()
+                return Disposables.create()
             }
         }
 
@@ -61,7 +61,7 @@ class ViewController: UIViewController {
         // Demo: add an action to a UIBarButtonItem in the navigation item
         self.navigationItem.rightBarButtonItem?.rx.action = CocoaAction {
             print("Bar button item was pressed, simulating a 2 second action")
-            return Observable.empty().delaySubscription(2, scheduler: MainScheduler.instance)
+            return Observable.empty().delaySubscription(.seconds(2), scheduler: MainScheduler.instance)
         }
 
         // Demo: observe the output of both actions, spin an activity indicator
@@ -92,20 +92,20 @@ class ViewController: UIViewController {
         }
         self.navigationItem.leftBarButtonItem?.rx.bind(to: sharedAction, input: .barButton)
 
-        sharedAction.executing.debounce(0, scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
+        sharedAction.executing.debounce(.seconds(0), scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
             if (executing) {
                 self?.activityIndicator.startAnimating()
             }
             else {
                 self?.activityIndicator.stopAnimating()
             }
         })
-        .disposed(by: self.disposableBag)
+            .disposed(by: self.disposableBag)
 
         sharedAction.elements.subscribe(onNext: { string in
             print(string  + " pressed")
         })
-        .disposed(by: self.disposableBag)
+            .disposed(by: self.disposableBag)
 
 
         var refreshControl = UIRefreshControl()
@@ -114,10 +114,10 @@ class ViewController: UIViewController {
             print("Reloading was triggered!")
             return Observable
                 .empty()
-                .delaySubscription(2, scheduler: MainScheduler.instance)
+                .delaySubscription(.seconds(2), scheduler: MainScheduler.instance)
                 .do(onCompleted:{
                     print ("Reloading completed!")
-            })
+                })
         }
     }
 }
diff --git a/License.md b/License.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Ash Furrow
+Copyright (c) 2021 Ash Furrow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveX/RxSwift" ~> 4.4.2
		github "ReactiveX/RxSwift" >= 6.0