Skip to content

Commit 7f2bdaa

Browse files
kzaherkzaher
committed
Deprecates asSharedSequence extensions on ObservableType.
1 parent facd20b commit 7f2bdaa

File tree

5 files changed

+53
-71
lines changed

5 files changed

+53
-71
lines changed

‎.jazzy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ custom_categories:
4646
- ObservableConvertibleType+Driver
4747
- name: RxCocoa/Traits/SharedSequence
4848
children:
49-
- ObservableConvertibleType+SharedSequence
5049
- SchedulerType+SharedSequence
5150
- SharedSequence+Operators+arity
5251
- SharedSequence+Operators

‎Rx.xcodeproj/project.pbxproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,10 +1025,6 @@
10251025
C89AB1DF1DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B21DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift */; };
10261026
C89AB1E01DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B21DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift */; };
10271027
C89AB1E11DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B21DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift */; };
1028-
C89AB1E61DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */; };
1029-
C89AB1E71DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */; };
1030-
C89AB1E81DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */; };
1031-
C89AB1E91DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */; };
10321028
C89AB1EA1DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B61DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift */; };
10331029
C89AB1EB1DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B61DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift */; };
10341030
C89AB1EC1DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89AB1B61DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift */; };
@@ -2100,7 +2096,6 @@
21002096
C89AB1B01DAAC3350065FBE6 /* Driver+Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Driver+Subscription.swift"; sourceTree = "<group>"; };
21012097
C89AB1B11DAAC3350065FBE6 /* Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Driver.swift; sourceTree = "<group>"; };
21022098
C89AB1B21DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObservableConvertibleType+Driver.swift"; sourceTree = "<group>"; };
2103-
C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObservableConvertibleType+SharedSequence.swift"; sourceTree = "<group>"; };
21042099
C89AB1B61DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SharedSequence+Operators+arity.swift"; sourceTree = "<group>"; };
21052100
C89AB1B71DAAC3350065FBE6 /* SharedSequence+Operators+arity.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SharedSequence+Operators+arity.tt"; sourceTree = "<group>"; };
21062101
C89AB1B81DAAC3350065FBE6 /* SharedSequence+Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SharedSequence+Operators.swift"; sourceTree = "<group>"; };
@@ -3096,7 +3091,6 @@
30963091
C89AB1B41DAAC3350065FBE6 /* SharedSequence */ = {
30973092
isa = PBXGroup;
30983093
children = (
3099-
C89AB1B51DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift */,
31003094
C89AB1B61DAAC3350065FBE6 /* SharedSequence+Operators+arity.swift */,
31013095
C89AB1B71DAAC3350065FBE6 /* SharedSequence+Operators+arity.tt */,
31023096
C89AB1B81DAAC3350065FBE6 /* SharedSequence+Operators.swift */,
@@ -4144,7 +4138,6 @@
41444138
C89AB1F21DAAC3350065FBE6 /* SharedSequence+Operators.swift in Sources */,
41454139
9BA1CBD31C0F7D550044B50A /* UIActivityIndicatorView+Rx.swift in Sources */,
41464140
842A5A2C1C357F92003568D5 /* NSTextStorage+Rx.swift in Sources */,
4147-
C89AB1E61DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */,
41484141
C88254241B8A752B00B02D69 /* RxTextViewDelegateProxy.swift in Sources */,
41494142
C89AB2401DAAC3A60065FBE6 /* _RXDelegateProxy.m in Sources */,
41504143
C89AB2061DAAC3350065FBE6 /* KVORepresentable+Swift.swift in Sources */,
@@ -4215,7 +4208,6 @@
42154208
C89AB2131DAAC3350065FBE6 /* NotificationCenter+Rx.swift in Sources */,
42164209
C8BCD3F51C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */,
42174210
C89AB2491DAAC3A60065FBE6 /* _RXKVOObserver.m in Sources */,
4218-
C89AB1E71DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */,
42194211
C8D970CF1F5324D90058F2FE /* Signal+Subscription.swift in Sources */,
42204212
C89AB2171DAAC3350065FBE6 /* NSObject+Rx+KVORepresentable.swift in Sources */,
42214213
C89AB2071DAAC3350065FBE6 /* KVORepresentable+Swift.swift in Sources */,
@@ -5362,7 +5354,6 @@
53625354
844BC8AE1CE4FA6600F5C7CB /* RxPickerViewDelegateProxy.swift in Sources */,
53635355
C8BCD3F71C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */,
53645356
C89AB1C91DAAC3350065FBE6 /* ControlEvent.swift in Sources */,
5365-
C89AB1E91DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */,
53665357
C8B0F7191F530FE300548EBE /* PublishRelay.swift in Sources */,
53675358
C8F0C0301BBBFBB9001B112F /* UIGestureRecognizer+Rx.swift in Sources */,
53685359
C89AB2091DAAC3350065FBE6 /* KVORepresentable+Swift.swift in Sources */,
@@ -5450,7 +5441,6 @@
54505441
D203C4F31BB9C4CA00D02D00 /* RxCollectionViewReactiveArrayDataSource.swift in Sources */,
54515442
A5CD038C1F1660F40005A376 /* RxPickerViewAdapter.swift in Sources */,
54525443
D203C50B1BB9C53E00D02D00 /* UIScrollView+Rx.swift in Sources */,
5453-
C89AB1E81DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */,
54545444
C89AB1A81DAAC25A0065FBE6 /* RxCocoaObjCRuntimeError+Extensions.swift in Sources */,
54555445
D203C50C1BB9C53E00D02D00 /* UISearchBar+Rx.swift in Sources */,
54565446
C8B0F71B1F530FE500548EBE /* PublishRelay.swift in Sources */,

‎RxCocoa/Deprecated.swift

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,3 +448,56 @@ extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingSt
448448
})
449449
}
450450
}
451+
452+
extension ObservableConvertibleType {
453+
/**
454+
Converts anything convertible to `Observable` to `SharedSequence` unit.
455+
456+
- parameter onErrorJustReturn: Element to return in case of error and after that complete the sequence.
457+
- returns: Driving observable sequence.
458+
*/
459+
@available(*, deprecated, message: "Please use conversion methods to some SharedSequence specialization.")
460+
public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorJustReturn: E) -> SharedSequence<S, E> {
461+
let source = self
462+
.asObservable()
463+
.observeOn(S.scheduler)
464+
.catchErrorJustReturn(onErrorJustReturn)
465+
return SharedSequence(source)
466+
}
467+
468+
/**
469+
Converts anything convertible to `Observable` to `SharedSequence` unit.
470+
471+
- parameter onErrorDriveWith: SharedSequence that provides elements of the sequence in case of error.
472+
- returns: Driving observable sequence.
473+
*/
474+
@available(*, deprecated, message: "Please use conversion methods to some SharedSequence specialization.")
475+
public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorDriveWith: SharedSequence<S, E>) -> SharedSequence<S, E> {
476+
let source = self
477+
.asObservable()
478+
.observeOn(S.scheduler)
479+
.catchError { _ in
480+
onErrorDriveWith.asObservable()
481+
}
482+
return SharedSequence(source)
483+
}
484+
485+
/**
486+
Converts anything convertible to `Observable` to `SharedSequence` unit.
487+
488+
- parameter onErrorRecover: Calculates driver that continues to drive the sequence in case of error.
489+
- returns: Driving observable sequence.
490+
*/
491+
@available(*, deprecated, message: "Please use conversion methods to some SharedSequence specialization.")
492+
public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorRecover: @escaping (_ error: Swift.Error) -> SharedSequence<S, E>) -> SharedSequence<S, E> {
493+
let source = self
494+
.asObservable()
495+
.observeOn(S.scheduler)
496+
.catchError { error in
497+
onErrorRecover(error).asObservable()
498+
}
499+
return SharedSequence(source)
500+
}
501+
}
502+
503+

‎RxCocoa/Traits/SharedSequence/ObservableConvertibleType+SharedSequence.swift

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎Sources/RxCocoa/ObservableConvertibleType+SharedSequence.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)