Skip to content

Commit 5061f85

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 76ee92b + 8957f38 commit 5061f85

File tree

5 files changed

+31
-11
lines changed

5 files changed

+31
-11
lines changed

Action.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Action"
3-
s.version = "3.6.0"
3+
s.version = "3.7.0"
44
s.summary = "Abstracts actions to be performed in RxSwift."
55
s.description = <<-DESC
66
Encapsulates an action to be performed, usually by a button press, but also useful to pass actions to execute later
@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
2020
s.source_files = "Sources/**/*.{swift}"
2121

2222
s.frameworks = "Foundation"
23-
s.dependency "RxSwift", "~> 4.2.0"
24-
s.dependency "RxCocoa", "~> 4.2.0"
23+
s.dependency "RxSwift", "~> 4.3.0"
24+
s.dependency "RxCocoa", "~> 4.3.0"
2525

2626
s.watchos.exclude_files = "Control+Action.swift", "Button+Action.swift", "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
2727
s.osx.exclude_files = "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"

Action.xcodeproj/project.pbxproj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@
598598
};
599599
7F5E6A661D7F08D2000B6076 = {
600600
CreatedOnToolsVersion = 8.0;
601-
LastSwiftMigration = 0810;
601+
LastSwiftMigration = 1000;
602602
ProvisioningStyle = Automatic;
603603
};
604604
7F612ACB1D7F13B800B93BC5 = {
@@ -607,7 +607,7 @@
607607
};
608608
BE73AD1F1CDCD101006F8B98 = {
609609
CreatedOnToolsVersion = 7.3;
610-
LastSwiftMigration = 0800;
610+
LastSwiftMigration = 1000;
611611
};
612612
};
613613
};
@@ -834,6 +834,7 @@
834834
SDKROOT = appletvos;
835835
SKIP_INSTALL = YES;
836836
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
837+
SWIFT_VERSION = 4.2;
837838
TARGETED_DEVICE_FAMILY = 3;
838839
TVOS_DEPLOYMENT_TARGET = 9.0;
839840
};
@@ -860,6 +861,7 @@
860861
PRODUCT_NAME = Action;
861862
SDKROOT = appletvos;
862863
SKIP_INSTALL = YES;
864+
SWIFT_VERSION = 4.2;
863865
TARGETED_DEVICE_FAMILY = 3;
864866
TVOS_DEPLOYMENT_TARGET = 9.0;
865867
};
@@ -892,6 +894,7 @@
892894
SDKROOT = macosx;
893895
SKIP_INSTALL = YES;
894896
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
897+
SWIFT_VERSION = 4.2;
895898
};
896899
name = Debug;
897900
};
@@ -921,6 +924,7 @@
921924
PROVISIONING_PROFILE_SPECIFIER = "";
922925
SDKROOT = macosx;
923926
SKIP_INSTALL = YES;
927+
SWIFT_VERSION = 4.2;
924928
};
925929
name = Release;
926930
};
@@ -947,6 +951,7 @@
947951
SDKROOT = watchos;
948952
SKIP_INSTALL = YES;
949953
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
954+
SWIFT_VERSION = 4.2;
950955
TARGETED_DEVICE_FAMILY = 4;
951956
WATCHOS_DEPLOYMENT_TARGET = 2.0;
952957
};
@@ -974,6 +979,7 @@
974979
PRODUCT_NAME = Action;
975980
SDKROOT = watchos;
976981
SKIP_INSTALL = YES;
982+
SWIFT_VERSION = 4.2;
977983
TARGETED_DEVICE_FAMILY = 4;
978984
WATCHOS_DEPLOYMENT_TARGET = 2.0;
979985
};
@@ -1050,7 +1056,7 @@
10501056
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
10511057
PRODUCT_NAME = "$(TARGET_NAME)";
10521058
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1053-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1059+
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2;
10541060
};
10551061
name = Debug;
10561062
};
@@ -1067,6 +1073,7 @@
10671073
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10681074
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
10691075
PRODUCT_NAME = "$(TARGET_NAME)";
1076+
SWIFT_VERSION = 4.2;
10701077
};
10711078
name = Release;
10721079
};
@@ -1235,6 +1242,7 @@
12351242
PRODUCT_NAME = "$(TARGET_NAME)";
12361243
SKIP_INSTALL = YES;
12371244
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1245+
SWIFT_VERSION = 4.2;
12381246
};
12391247
name = Debug;
12401248
};
@@ -1257,6 +1265,7 @@
12571265
PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;
12581266
PRODUCT_NAME = "$(TARGET_NAME)";
12591267
SKIP_INSTALL = YES;
1268+
SWIFT_VERSION = 4.2;
12601269
};
12611270
name = Release;
12621271
};

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 4.2.0
1+
github "ReactiveX/RxSwift" ~> 4.3.0

Changelog.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ Current master
55
--------------
66
- Fix build failure on New Build System (default on Xcode 10) [#151](https://github.com/RxSwiftCommunity/Action/pull/151)
77

8+
3.7.0
9+
-----
10+
- Added full support for Swift 4.2
11+
- Added full support for RxSwift 4.3
12+
813
3.6.0
914
-----
1015
- Updated `Semantic Versioning` to reflect what is actaully released both on `Pod` and `Carthage`
1116
- Added full support for Swift 4.1
1217
- Added full support for RxSwift 4.2.0
13-
- UIRefreshControl support: binding to an action (or CocoaAction) starts the action itself and updates the control's refreshing status
18+
- UIRefreshControl support: binding to an action (or CocoaAction) starts the action itself and updates the control's refreshing status
1419

1520
3.5.0
1621
-----
@@ -135,7 +140,7 @@ Added `UIAlertAction` support.
135140
0.2.1
136141
-----
137142

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

140145
0.2.0
141146
-----

Sources/Action/UIKitExtensions/UIAlertAction+Action.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ import UIKit
33
import RxSwift
44
import RxCocoa
55

6-
public extension UIAlertAction {
6+
#if swift(>=4.2)
7+
public typealias ActionStyle = UIAlertAction.Style
8+
#else
9+
public typealias ActionStyle = UIAlertActionStyle
10+
#endif
711

8-
public static func Action(_ title: String?, style: UIAlertActionStyle) -> UIAlertAction {
12+
public extension UIAlertAction {
13+
14+
public static func Action(_ title: String?, style: ActionStyle) -> UIAlertAction {
915
return UIAlertAction(title: title, style: style, handler: { action in
1016
action.rx.action?.execute(())
1117
return

0 commit comments

Comments
 (0)