Skip to content

Commit 287e2ca

Browse files
author
Marcin Mucha
committed
Resolve merge conflicts
2 parents 1f7933b + 35130e4 commit 287e2ca

File tree

11 files changed

+110
-18
lines changed

11 files changed

+110
-18
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1
1+
4.0

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
os: osx
22
language: objective-c
3-
osx_image: xcode8
3+
osx_image: xcode9
44

55
script:
66
- set -o pipefail

‎Action.podspec

Lines changed: 4 additions & 4 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.2.0"
3+
s.version = "3.3.0-alpha.1"
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
@@ -16,12 +16,12 @@ Pod::Spec.new do |s|
1616
s.watchos.deployment_target = '2.0'
1717
s.tvos.deployment_target = '9.0'
1818

19-
s.source = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version }
19+
s.source = { :git => "https://github.com/RxSwiftCommunity/Action.git", :tag => s.version.to_s }
2020
s.source_files = "Sources/**/*.{swift}"
2121

2222
s.frameworks = "Foundation"
23-
s.dependency "RxSwift", "~> 3.4"
24-
s.dependency "RxCocoa", "~> 3.4"
23+
s.dependency "RxSwift", "~> 4.0.0-alpha.1"
24+
s.dependency "RxCocoa", "~> 4.0.0-alpha.1"
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/xcshareddata/xcschemes/Demo.xcscheme

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0830"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
18+
BuildableName = "Demo.app"
19+
BlueprintName = "Demo"
20+
ReferencedContainer = "container:Action.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES">
31+
<Testables>
32+
</Testables>
33+
<MacroExpansion>
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
37+
BuildableName = "Demo.app"
38+
BlueprintName = "Demo"
39+
ReferencedContainer = "container:Action.xcodeproj">
40+
</BuildableReference>
41+
</MacroExpansion>
42+
<AdditionalOptions>
43+
</AdditionalOptions>
44+
</TestAction>
45+
<LaunchAction
46+
buildConfiguration = "Debug"
47+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
50+
launchStyle = "0"
51+
useCustomWorkingDirectory = "NO"
52+
ignoresPersistentStateOnLaunch = "NO"
53+
debugDocumentVersioning = "YES"
54+
debugServiceExtension = "internal"
55+
allowLocationSimulation = "YES">
56+
<BuildableProductRunnable
57+
runnableDebuggingMode = "0">
58+
<BuildableReference
59+
BuildableIdentifier = "primary"
60+
BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
61+
BuildableName = "Demo.app"
62+
BlueprintName = "Demo"
63+
ReferencedContainer = "container:Action.xcodeproj">
64+
</BuildableReference>
65+
</BuildableProductRunnable>
66+
<AdditionalOptions>
67+
</AdditionalOptions>
68+
</LaunchAction>
69+
<ProfileAction
70+
buildConfiguration = "Release"
71+
shouldUseLaunchSchemeArgsEnv = "YES"
72+
savedToolIdentifier = ""
73+
useCustomWorkingDirectory = "NO"
74+
debugDocumentVersioning = "YES">
75+
<BuildableProductRunnable
76+
runnableDebuggingMode = "0">
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "7F612ACB1D7F13B800B93BC5"
80+
BuildableName = "Demo.app"
81+
BlueprintName = "Demo"
82+
ReferencedContainer = "container:Action.xcodeproj">
83+
</BuildableReference>
84+
</BuildableProductRunnable>
85+
</ProfileAction>
86+
<AnalyzeAction
87+
buildConfiguration = "Debug">
88+
</AnalyzeAction>
89+
<ArchiveAction
90+
buildConfiguration = "Release"
91+
revealArchiveInOrganizer = "YES">
92+
</ArchiveAction>
93+
</Scheme>

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 4.0
1+
github "ReactiveX/RxSwift" "4.0.0-alpha.1"

‎Package.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ let package = Package(
44
name: "Action",
55
targets: [],
66
dependencies: [
7-
.Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 4)
8-
]
7+
.Package(url: "https://github.com/ReactiveX/RxSwift.git", Version(4, 0, 0, prereleaseIdentifiers: ["alpha.1"]))
8+
],
9+
exclude: ["Tests/"]
910
)
1011

‎Sources/Action/Action.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ public final class Action<Input, Element> {
6666
errors = errorsSubject.asObservable()
6767

6868
executionObservables = inputs
69-
.withLatestFrom(enabled, resultSelector: { input, enabled in
70-
return (input, enabled)
71-
})
72-
.flatMap { (input, enabled) -> Observable<Observable<Element>> in
69+
.withLatestFrom(enabled) { input, enabled in (input, enabled) }
70+
.flatMap { input, enabled -> Observable<Observable<Element>> in
7371
if enabled {
7472
return Observable.of(workFactory(input)
7573
.do(onError: { errorsSubject.onNext(.underlyingError($0)) })

‎Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public extension Reactive where Base: UIBarButtonItem {
3030
.bind(to: self.isEnabled)
3131
.disposed(by: self.base.actionDisposeBag)
3232

33-
self.tap.subscribe(onNext: { _ in
33+
self.tap.subscribe(onNext: {
3434
action.execute(())
3535
})
3636
.disposed(by: self.base.actionDisposeBag)

‎Tests/iOS-Tests/AlertActionTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AlertActionTests: QuickSpec {
3434

3535
subject.rx.action = action
3636

37-
action.execute()
37+
action.execute(())
3838
expect(subject.isEnabled).toEventually( beFalse() )
3939

4040
observer.onCompleted()

‎Tests/iOS-Tests/BarButtonTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class BarButtonTests: QuickSpec {
3535

3636
subject.rx.action = action
3737

38-
action.execute()
38+
action.execute(())
3939
expect(subject.isEnabled).toEventually( beFalse() )
4040

4141
observer.onCompleted()

‎Tests/iOS-Tests/ButtonTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ButtonTests: QuickSpec {
3535

3636
subject.rx.action = action
3737

38-
action.execute()
38+
action.execute(())
3939
expect(subject.isEnabled).toEventually( beFalse() )
4040

4141
observer.onCompleted()
@@ -123,7 +123,7 @@ class ButtonTests: QuickSpec {
123123
}
124124

125125
subject.rx.action = action
126-
subject.rx.action?.execute()
126+
subject.rx.action?.execute(())
127127
}
128128
}
129129

0 commit comments

Comments
 (0)