Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gin0606 committed Sep 19, 2018
2 parents 76ee92b + 8957f38 commit 5061f85
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Action.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Action"
s.version = "3.6.0"
s.version = "3.7.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
Expand All @@ -20,8 +20,8 @@ Pod::Spec.new do |s|
s.source_files = "Sources/**/*.{swift}"

s.frameworks = "Foundation"
s.dependency "RxSwift", "~> 4.2.0"
s.dependency "RxCocoa", "~> 4.2.0"
s.dependency "RxSwift", "~> 4.3.0"
s.dependency "RxCocoa", "~> 4.3.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"
Expand Down
15 changes: 12 additions & 3 deletions Action.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
};
7F5E6A661D7F08D2000B6076 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
7F612ACB1D7F13B800B93BC5 = {
Expand All @@ -607,7 +607,7 @@
};
BE73AD1F1CDCD101006F8B98 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0800;
LastSwiftMigration = 1000;
};
};
};
Expand Down Expand Up @@ -834,6 +834,7 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -860,6 +861,7 @@
PRODUCT_NAME = Action;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand Down Expand Up @@ -892,6 +894,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand Down Expand Up @@ -921,6 +924,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -947,6 +951,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
Expand Down Expand Up @@ -974,6 +979,7 @@
PRODUCT_NAME = Action;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
Expand Down Expand Up @@ -1050,7 +1056,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1067,6 +1073,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down Expand Up @@ -1235,6 +1242,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1257,6 +1265,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.2.0
github "ReactiveX/RxSwift" ~> 4.3.0
9 changes: 7 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ Current master
--------------
- 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
- UIRefreshControl support: binding to an action (or CocoaAction) starts the action itself and updates the control's refreshing status

3.5.0
-----
Expand Down Expand Up @@ -135,7 +140,7 @@ Added `UIAlertAction` support.
0.2.1
-----

- Fixes `enabledIf:` parameter to be `Observable<B>`, `where B: BooleanType`.
- Fixes `enabledIf:` parameter to be `Observable<B>`, `where B: BooleanType`.

0.2.0
-----
Expand Down
10 changes: 8 additions & 2 deletions Sources/Action/UIKitExtensions/UIAlertAction+Action.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ import UIKit
import RxSwift
import RxCocoa

public extension UIAlertAction {
#if swift(>=4.2)
public typealias ActionStyle = UIAlertAction.Style
#else
public typealias ActionStyle = UIAlertActionStyle
#endif

public static func Action(_ title: String?, style: UIAlertActionStyle) -> UIAlertAction {
public extension UIAlertAction {

public static func Action(_ title: String?, style: ActionStyle) -> UIAlertAction {
return UIAlertAction(title: title, style: style, handler: { action in
action.rx.action?.execute(())
return
Expand Down

0 comments on commit 5061f85

Please sign in to comment.