diff --git a/RxCocoa/Common/DelegateProxyType.swift b/RxCocoa/Common/DelegateProxyType.swift index 893ccb23..a669dfbc 100644 --- a/RxCocoa/Common/DelegateProxyType.swift +++ b/RxCocoa/Common/DelegateProxyType.swift @@ -273,6 +273,6 @@ extension ObservableType { } } - return CompositeDisposable(subscription, disposable) + return Disposables.create(subscription, disposable) } } diff --git a/RxExample/RxExample-iOSTests/TestScheduler+MarbleTests.swift b/RxExample/RxExample-iOSTests/TestScheduler+MarbleTests.swift index 5cd2e991..550797db 100644 --- a/RxExample/RxExample-iOSTests/TestScheduler+MarbleTests.swift +++ b/RxExample/RxExample-iOSTests/TestScheduler+MarbleTests.swift @@ -156,7 +156,7 @@ extension TestScheduler { attemptCount += 1 - return CompositeDisposable(disposables: scheduledEvents) + return Disposables.create(scheduledEvents) } } diff --git a/RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift b/RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift index 58b6f9b7..75e30797 100644 --- a/RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift +++ b/RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift @@ -56,7 +56,7 @@ extension UIImagePickerController { parent.present(imagePicker, animated: animated, completion: nil) observer.on(.next(imagePicker)) - return CompositeDisposable(dismissDisposable, AnonymousDisposable { + return Disposables.create(dismissDisposable, AnonymousDisposable { dismissViewController(imagePicker, animated: animated) }) } diff --git a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift index fb5754ce..d4212fa8 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift +++ b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift @@ -100,7 +100,7 @@ class CombineLatestCollectionTypeSink : CombineLatestSink { subscription1.disposable = _parent._source1.subscribe(observer1) subscription2.disposable = _parent._source2.subscribe(observer2) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2 ]) @@ -142,7 +142,7 @@ class CombineLatestSink3_ : CombineLatestSink { subscription2.disposable = _parent._source2.subscribe(observer2) subscription3.disposable = _parent._source3.subscribe(observer3) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3 @@ -234,7 +234,7 @@ class CombineLatestSink4_ : CombineLatestSink : CombineLatestSi subscription4.disposable = _parent._source4.subscribe(observer4) subscription5.disposable = _parent._source5.subscribe(observer5) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -439,7 +439,7 @@ class CombineLatestSink6_ : CombineLate subscription5.disposable = _parent._source5.subscribe(observer5) subscription6.disposable = _parent._source6.subscribe(observer6) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -552,7 +552,7 @@ class CombineLatestSink7_ : Combine subscription6.disposable = _parent._source6.subscribe(observer6) subscription7.disposable = _parent._source7.subscribe(observer7) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -672,7 +672,7 @@ class CombineLatestSink8_ : Com subscription7.disposable = _parent._source7.subscribe(observer7) subscription8.disposable = _parent._source8.subscribe(observer8) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, diff --git a/RxSwift/Observables/Implementations/CombineLatest+arity.tt b/RxSwift/Observables/Implementations/CombineLatest+arity.tt index 437384c9..624a241e 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+arity.tt +++ b/RxSwift/Observables/Implementations/CombineLatest+arity.tt @@ -60,7 +60,7 @@ class CombineLatestSink<%= i %>_<<%= (Array(1...i).map { "E\($0)" }).joined(sepa " subscription\($0).disposable = _parent._source\($0).subscribe(observer\($0))" }).joined(separator: "\n") %> - return CompositeDisposable(disposables: [ + return Disposables.create([ <%= (Array(1...i).map { " subscription\($0)" }).joined(separator: ",\n") %> ]) } diff --git a/RxSwift/Observables/Implementations/Zip+CollectionType.swift b/RxSwift/Observables/Implementations/Zip+CollectionType.swift index 7c35a8a0..38d0cc4b 100644 --- a/RxSwift/Observables/Implementations/Zip+CollectionType.swift +++ b/RxSwift/Observables/Implementations/Zip+CollectionType.swift @@ -112,7 +112,7 @@ class ZipCollectionTypeSink : ZipSink { subscription1.disposable = _parent.source1.subscribe(observer1) subscription2.disposable = _parent.source2.subscribe(observer2) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2 ]) @@ -167,7 +167,7 @@ class ZipSink3_ : ZipSink { subscription2.disposable = _parent.source2.subscribe(observer2) subscription3.disposable = _parent.source3.subscribe(observer3) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3 @@ -273,7 +273,7 @@ class ZipSink4_ : ZipSink { subscription3.disposable = _parent.source3.subscribe(observer3) subscription4.disposable = _parent.source4.subscribe(observer4) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -387,7 +387,7 @@ class ZipSink5_ : ZipSink { subscription4.disposable = _parent.source4.subscribe(observer4) subscription5.disposable = _parent.source5.subscribe(observer5) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -509,7 +509,7 @@ class ZipSink6_ : ZipSink { subscription5.disposable = _parent.source5.subscribe(observer5) subscription6.disposable = _parent.source6.subscribe(observer6) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -639,7 +639,7 @@ class ZipSink7_ : ZipSink { subscription6.disposable = _parent.source6.subscribe(observer6) subscription7.disposable = _parent.source7.subscribe(observer7) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, @@ -777,7 +777,7 @@ class ZipSink8_ : ZipSink { subscription7.disposable = _parent.source7.subscribe(observer7) subscription8.disposable = _parent.source8.subscribe(observer8) - return CompositeDisposable(disposables: [ + return Disposables.create([ subscription1, subscription2, subscription3, diff --git a/RxSwift/Observables/Implementations/Zip+arity.tt b/RxSwift/Observables/Implementations/Zip+arity.tt index 8e1e5e16..9af1dc7d 100644 --- a/RxSwift/Observables/Implementations/Zip+arity.tt +++ b/RxSwift/Observables/Implementations/Zip+arity.tt @@ -72,7 +72,7 @@ class ZipSink<%= i %>_<<%= (Array(1...i).map { "E\($0)" }).joined(separator: ", " subscription\($0).disposable = _parent.source\($0).subscribe(observer\($0))" }).joined(separator: "\n") %> - return CompositeDisposable(disposables: [ + return Disposables.create([ <%= (Array(1...i).map { " subscription\($0)" }).joined(separator: ",\n") %> ]) }