Skip to content

Commit ee52caf

Browse files
authored
Merge pull request #110 from bobgodwinx/master
RxSwift 4.0.0-rc0
2 parents 35130e4 + 280c442 commit ee52caf

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Action.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.0.0-alpha.1"
24-
s.dependency "RxCocoa", "~> 4.0.0-alpha.1"
23+
s.dependency "RxSwift", "~> 4.0.0-rc.0"
24+
s.dependency "RxCocoa", "~> 4.0.0-rc.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"

Cartfile

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

Sources/Action/Action.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public final class Action<Input, Element> {
7171
if enabled {
7272
return Observable.of(workFactory(input)
7373
.do(onError: { errorsSubject.onNext(.underlyingError($0)) })
74-
.shareReplay(1))
74+
.share(replay: 1, scope: .forever))
7575
} else {
7676
errorsSubject.onNext(.notEnabled)
7777
return Observable.empty()
@@ -93,7 +93,7 @@ public final class Action<Input, Element> {
9393
Observable.just(false)])
9494
}
9595
.startWith(false)
96-
.shareReplay(1)
96+
.share(replay: 1, scope: .forever)
9797

9898
Observable
9999
.combineLatest(executing, enabledIf) { !$0 && $1 }

0 commit comments

Comments
 (0)