From aca3b2821339654f936dabf7b201f112e0e8a780 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Thu, 31 Dec 2015 00:37:58 +0100 Subject: [PATCH] Removes deprecated APIs. --- Rx.xcodeproj/project.pbxproj | 72 ------ .../Driver/Driver+Operators+arity.swift | 140 ------------ .../Driver/Driver+Operators+arity.tt | 20 -- .../CocoaUnits/Driver/Driver+Operators.swift | 18 -- RxCocoa/Common/CocoaUnits/Driver/Driver.swift | 31 --- RxCocoa/Common/DelegateProxyType.swift | 5 - .../NSObject+Rx+CoreGraphics.swift | 97 -------- RxCocoa/Common/Observables/NSObject+Rx.swift | 48 ---- RxCocoa/OSX/NSButton+Rx.swift | 2 +- RxCocoa/OSX/NSControl+Rx.swift | 5 - .../Proxies/RxActionSheetDelegateProxy.swift | 32 --- .../Proxies/RxAlertViewDelegateProxy.swift | 33 --- RxCocoa/iOS/UIActionSheet+Rx.swift | 69 ------ RxCocoa/iOS/UIAlertView+Rx.swift | 68 ------ RxCocoa/iOS/UICollectionView+Rx.swift | 5 - RxCocoa/iOS/UIControl+Rx.swift | 5 - RxCocoa/iOS/UITableView+Rx.swift | 5 - RxExample/RxExample.xcodeproj/project.pbxproj | 32 --- .../APIWrappersViewController.swift | 64 ------ ...tHubSearchRepositoriesViewController.swift | 2 - .../PartialUpdatesViewController.swift | 6 +- RxExample/RxExample/Services/Wireframe.swift | 51 ++--- RxSwift/Disposables/ScopedDisposable.swift | 59 ----- .../Implementations/CombineLatest+arity.swift | 70 ------ .../Implementations/CombineLatest+arity.tt | 10 - .../Implementations/Zip+arity.swift | 70 ------ .../Observables/Implementations/Zip+arity.tt | 10 - .../Observables/Observable+Aggregate.swift | 6 - RxSwift/Observables/Observable+Creation.swift | 73 ------ RxSwift/Observables/Observable+Time.swift | 80 ------- RxSwift/ObserverType+Extensions.swift | 29 --- .../ConcurrentDispatchQueueScheduler.swift | 19 -- .../Schedulers/ConcurrentMainScheduler.swift | 3 - .../DispatchQueueSchedulerPriority.swift | 31 --- RxSwift/Schedulers/MainScheduler.swift | 6 - .../SerialDispatchQueueScheduler.swift | 20 -- RxSwift/Subjects/Variable.swift | 17 +- .../DispatchQueueSchedulerPriority.swift | 1 - Sources/RxSwift/ObserverType+Extensions.swift | 1 - Sources/RxSwift/ScopedDisposable.swift | 1 - .../RxCocoaTests/Control+RxTests+UIKit.swift | 24 +- Tests/RxCocoaTests/KVOObservableTests.swift | 211 ------------------ 42 files changed, 27 insertions(+), 1524 deletions(-) delete mode 100644 RxCocoa/Common/Observables/NSObject+Rx+CoreGraphics.swift delete mode 100644 RxCocoa/iOS/Proxies/RxActionSheetDelegateProxy.swift delete mode 100644 RxCocoa/iOS/Proxies/RxAlertViewDelegateProxy.swift delete mode 100644 RxCocoa/iOS/UIActionSheet+Rx.swift delete mode 100644 RxCocoa/iOS/UIAlertView+Rx.swift delete mode 100644 RxSwift/Disposables/ScopedDisposable.swift delete mode 100644 RxSwift/ObserverType+Extensions.swift delete mode 100644 RxSwift/Schedulers/DispatchQueueSchedulerPriority.swift delete mode 120000 Sources/RxSwift/DispatchQueueSchedulerPriority.swift delete mode 120000 Sources/RxSwift/ObserverType+Extensions.swift delete mode 120000 Sources/RxSwift/ScopedDisposable.swift diff --git a/Rx.xcodeproj/project.pbxproj b/Rx.xcodeproj/project.pbxproj index 4c7ef600..3b592b91 100644 --- a/Rx.xcodeproj/project.pbxproj +++ b/Rx.xcodeproj/project.pbxproj @@ -59,8 +59,6 @@ C8093CE61B8A72BE0088E94D /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5C1B8A72BE0088E94D /* NopDisposable.swift */; }; C8093CE71B8A72BE0088E94D /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5D1B8A72BE0088E94D /* ScheduledDisposable.swift */; }; C8093CE81B8A72BE0088E94D /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5D1B8A72BE0088E94D /* ScheduledDisposable.swift */; }; - C8093CE91B8A72BE0088E94D /* ScopedDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */; }; - C8093CEA1B8A72BE0088E94D /* ScopedDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */; }; C8093CEB1B8A72BE0088E94D /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */; }; C8093CEC1B8A72BE0088E94D /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */; }; C8093CED1B8A72BE0088E94D /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C601B8A72BE0088E94D /* SingleAssignmentDisposable.swift */; }; @@ -173,8 +171,6 @@ C8093D741B8A72BE0088E94D /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA61B8A72BE0088E94D /* ObserverBase.swift */; }; C8093D791B8A72BE0088E94D /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA91B8A72BE0088E94D /* TailRecursiveSink.swift */; }; C8093D7A1B8A72BE0088E94D /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA91B8A72BE0088E94D /* TailRecursiveSink.swift */; }; - C8093D7B1B8A72BE0088E94D /* ObserverType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */; }; - C8093D7C1B8A72BE0088E94D /* ObserverType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */; }; C8093D7D1B8A72BE0088E94D /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAB1B8A72BE0088E94D /* ObserverType.swift */; }; C8093D7E1B8A72BE0088E94D /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAB1B8A72BE0088E94D /* ObserverType.swift */; }; C8093D851B8A72BE0088E94D /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAF1B8A72BE0088E94D /* Rx.swift */; }; @@ -185,8 +181,6 @@ C8093D8E1B8A72BE0088E94D /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB31B8A72BE0088E94D /* SchedulerType.swift */; }; C8093D8F1B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB51B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift */; }; C8093D901B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB51B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift */; }; - C8093D911B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */; }; - C8093D921B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */; }; C8093D931B8A72BE0088E94D /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB71B8A72BE0088E94D /* MainScheduler.swift */; }; C8093D941B8A72BE0088E94D /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB71B8A72BE0088E94D /* MainScheduler.swift */; }; C8093D951B8A72BE0088E94D /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB81B8A72BE0088E94D /* OperationQueueScheduler.swift */; }; @@ -232,8 +226,6 @@ C8093EF01B8A732E0088E94D /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E941B8A732E0088E94D /* KVOObserver.swift */; }; C8093EF11B8A732E0088E94D /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E951B8A732E0088E94D /* NSNotificationCenter+Rx.swift */; }; C8093EF21B8A732E0088E94D /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E951B8A732E0088E94D /* NSNotificationCenter+Rx.swift */; }; - C8093EF31B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */; }; - C8093EF41B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */; }; C8093EF51B8A732E0088E94D /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E971B8A732E0088E94D /* NSObject+Rx.swift */; }; C8093EF61B8A732E0088E94D /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E971B8A732E0088E94D /* NSObject+Rx.swift */; }; C8093EF71B8A732E0088E94D /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E981B8A732E0088E94D /* NSURLSession+Rx.swift */; }; @@ -379,8 +371,6 @@ C88254181B8A752B00B02D69 /* ItemEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F41B8A752B00B02D69 /* ItemEvents.swift */; }; C882541A1B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F71B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift */; }; C882541B1B8A752B00B02D69 /* RxTableViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F81B8A752B00B02D69 /* RxTableViewDataSourceType.swift */; }; - C882541C1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FA1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift */; }; - C882541D1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */; }; C882541E1B8A752B00B02D69 /* RxCollectionViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FC1B8A752B00B02D69 /* RxCollectionViewDataSourceProxy.swift */; }; C882541F1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FD1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift */; }; C88254201B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FE1B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift */; }; @@ -388,8 +378,6 @@ C88254221B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254001B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift */; }; C88254231B8A752B00B02D69 /* RxTableViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254011B8A752B00B02D69 /* RxTableViewDelegateProxy.swift */; }; C88254241B8A752B00B02D69 /* RxTextViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254021B8A752B00B02D69 /* RxTextViewDelegateProxy.swift */; }; - C88254251B8A752B00B02D69 /* UIActionSheet+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254031B8A752B00B02D69 /* UIActionSheet+Rx.swift */; }; - C88254261B8A752B00B02D69 /* UIAlertView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254041B8A752B00B02D69 /* UIAlertView+Rx.swift */; }; C88254271B8A752B00B02D69 /* UIBarButtonItem+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254051B8A752B00B02D69 /* UIBarButtonItem+Rx.swift */; }; C88254281B8A752B00B02D69 /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254061B8A752B00B02D69 /* UIButton+Rx.swift */; }; C88254291B8A752B00B02D69 /* UICollectionView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254071B8A752B00B02D69 /* UICollectionView+Rx.swift */; }; @@ -575,7 +563,6 @@ C8F0BFB61BBBFB8B001B112F /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C551B8A72BE0088E94D /* BinaryDisposable.swift */; }; C8F0BFB71BBBFB8B001B112F /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C801B8A72BE0088E94D /* ObserveOn.swift */; }; C8F0BFB81BBBFB8B001B112F /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C861B8A72BE0088E94D /* Sample.swift */; }; - C8F0BFB91BBBFB8B001B112F /* ScopedDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */; }; C8F0BFBA1BBBFB8B001B112F /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C7E1B8A72BE0088E94D /* Multicast.swift */; }; C8F0BFBB1BBBFB8B001B112F /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3DA0E1B939767004D233E /* CurrentThreadScheduler.swift */; }; C8F0BFBC1BBBFB8B001B112F /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAF1B8A72BE0088E94D /* Rx.swift */; }; @@ -589,7 +576,6 @@ C8F0BFC41BBBFB8B001B112F /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB31B8A72BE0088E94D /* SchedulerType.swift */; }; C8F0BFC51BBBFB8B001B112F /* Variable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CC21B8A72BE0088E94D /* Variable.swift */; }; C8F0BFC61BBBFB8B001B112F /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB81B8A72BE0088E94D /* OperationQueueScheduler.swift */; }; - C8F0BFC71BBBFB8B001B112F /* DispatchQueueSchedulerPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */; }; C8F0BFC81BBBFB8B001B112F /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C6F1B8A72BE0088E94D /* CombineLatest+arity.swift */; }; C8F0BFC91BBBFB8B001B112F /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C581B8A72BE0088E94D /* DisposeBag.swift */; }; C8F0BFCA1BBBFB8B001B112F /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB91B8A72BE0088E94D /* RecursiveScheduler.swift */; }; @@ -636,7 +622,6 @@ C8F0BFF51BBBFB8B001B112F /* NAryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5A1B8A72BE0088E94D /* NAryDisposable.swift */; }; C8F0BFF61BBBFB8B001B112F /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */; }; C8F0BFF71BBBFB8B001B112F /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3DA0B1B93959F004D233E /* Never.swift */; }; - C8F0BFF81BBBFB8B001B112F /* ObserverType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */; }; C8F0BFF91BBBFB8B001B112F /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C641B8A72BE0088E94D /* Event.swift */; }; C8F0BFFA1BBBFB8B001B112F /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C941B8A72BE0088E94D /* Zip.swift */; }; C8F0C0061BBBFBB9001B112F /* UISlider+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254101B8A752B00B02D69 /* UISlider+Rx.swift */; }; @@ -653,28 +638,23 @@ C8F0C0111BBBFBB9001B112F /* UIStepper+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = F31F35AF1BB4FED800961002 /* UIStepper+Rx.swift */; }; C8F0C0121BBBFBB9001B112F /* UIImageView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C882540B1B8A752B00B02D69 /* UIImageView+Rx.swift */; }; C8F0C0131BBBFBB9001B112F /* ControlEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D33931B922FB00014629D /* ControlEvent.swift */; }; - C8F0C0141BBBFBB9001B112F /* NSObject+Rx+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */; }; C8F0C0151BBBFBB9001B112F /* UIControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254081B8A752B00B02D69 /* UIControl+Rx.swift */; }; C8F0C0161BBBFBB9001B112F /* UITableView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254121B8A752B00B02D69 /* UITableView+Rx.swift */; }; C8F0C0171BBBFBB9001B112F /* RxCollectionViewReactiveArrayDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F11B8A752B00B02D69 /* RxCollectionViewReactiveArrayDataSource.swift */; }; C8F0C0181BBBFBB9001B112F /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E941B8A732E0088E94D /* KVOObserver.swift */; }; - C8F0C0191BBBFBB9001B112F /* UIAlertView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254041B8A752B00B02D69 /* UIAlertView+Rx.swift */; }; C8F0C01A1BBBFBB9001B112F /* RxCollectionViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FD1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift */; }; C8F0C01B1BBBFBB9001B112F /* RxScrollViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FE1B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift */; }; C8F0C01C1BBBFBB9001B112F /* UILabel+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C882540C1B8A752B00B02D69 /* UILabel+Rx.swift */; }; C8F0C01D1BBBFBB9001B112F /* RxSearchBarDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FF1B8A752B00B02D69 /* RxSearchBarDelegateProxy.swift */; }; - C8F0C01E1BBBFBB9001B112F /* RxAlertViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */; }; C8F0C01F1BBBFBB9001B112F /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; }; C8F0C0201BBBFBB9001B112F /* UISegmentedControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C882540F1B8A752B00B02D69 /* UISegmentedControl+Rx.swift */; }; C8F0C0211BBBFBB9001B112F /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E931B8A732E0088E94D /* KVOObservable.swift */; }; C8F0C0221BBBFBB9001B112F /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254061B8A752B00B02D69 /* UIButton+Rx.swift */; }; C8F0C0231BBBFBB9001B112F /* CLLocationManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E8A1B8A732E0088E94D /* CLLocationManager+Rx.swift */; }; - C8F0C0251BBBFBB9001B112F /* RxActionSheetDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FA1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift */; }; C8F0C0261BBBFBB9001B112F /* _RXDelegateProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C8093E851B8A732E0088E94D /* _RXDelegateProxy.m */; }; C8F0C0271BBBFBB9001B112F /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E971B8A732E0088E94D /* NSObject+Rx.swift */; }; C8F0C0281BBBFBB9001B112F /* RxTextViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254021B8A752B00B02D69 /* RxTextViewDelegateProxy.swift */; }; C8F0C0291BBBFBB9001B112F /* UIBarButtonItem+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254051B8A752B00B02D69 /* UIBarButtonItem+Rx.swift */; }; - C8F0C02A1BBBFBB9001B112F /* UIActionSheet+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254031B8A752B00B02D69 /* UIActionSheet+Rx.swift */; }; C8F0C02B1BBBFBB9001B112F /* ControlProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D33941B922FB00014629D /* ControlProperty.swift */; }; C8F0C02C1BBBFBB9001B112F /* UIDatePicker+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254091B8A752B00B02D69 /* UIDatePicker+Rx.swift */; }; C8F0C02D1BBBFBB9001B112F /* RxTableViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254001B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift */; }; @@ -747,8 +727,6 @@ D203C4F51BB9C52900D02D00 /* ItemEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F41B8A752B00B02D69 /* ItemEvents.swift */; }; D203C4F61BB9C52E00D02D00 /* RxCollectionViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F71B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift */; }; D203C4F71BB9C53100D02D00 /* RxTableViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253F81B8A752B00B02D69 /* RxTableViewDataSourceType.swift */; }; - D203C4F81BB9C53700D02D00 /* RxActionSheetDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FA1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift */; }; - D203C4F91BB9C53700D02D00 /* RxAlertViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */; }; D203C4FA1BB9C53700D02D00 /* RxCollectionViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FC1B8A752B00B02D69 /* RxCollectionViewDataSourceProxy.swift */; }; D203C4FB1BB9C53700D02D00 /* RxCollectionViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FD1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift */; }; D203C4FC1BB9C53700D02D00 /* RxScrollViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FE1B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift */; }; @@ -756,8 +734,6 @@ D203C4FE1BB9C53700D02D00 /* RxTableViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254001B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift */; }; D203C4FF1BB9C53700D02D00 /* RxTableViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254011B8A752B00B02D69 /* RxTableViewDelegateProxy.swift */; }; D203C5001BB9C53700D02D00 /* RxTextViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254021B8A752B00B02D69 /* RxTextViewDelegateProxy.swift */; }; - D203C5011BB9C53E00D02D00 /* UIActionSheet+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254031B8A752B00B02D69 /* UIActionSheet+Rx.swift */; }; - D203C5021BB9C53E00D02D00 /* UIAlertView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254041B8A752B00B02D69 /* UIAlertView+Rx.swift */; }; D203C5031BB9C53E00D02D00 /* UIBarButtonItem+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254051B8A752B00B02D69 /* UIBarButtonItem+Rx.swift */; }; D203C5051BB9C53E00D02D00 /* UICollectionView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254071B8A752B00B02D69 /* UICollectionView+Rx.swift */; }; D203C5061BB9C53E00D02D00 /* UIControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254081B8A752B00B02D69 /* UIControl+Rx.swift */; }; @@ -792,7 +768,6 @@ D2138C911BB9BED600339B5C /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E931B8A732E0088E94D /* KVOObservable.swift */; }; D2138C921BB9BED600339B5C /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E941B8A732E0088E94D /* KVOObserver.swift */; }; D2138C931BB9BEDA00339B5C /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E951B8A732E0088E94D /* NSNotificationCenter+Rx.swift */; }; - D2138C941BB9BEDA00339B5C /* NSObject+Rx+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */; }; D2138C951BB9BEDA00339B5C /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E971B8A732E0088E94D /* NSObject+Rx.swift */; }; D2138C961BB9BEDA00339B5C /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E981B8A732E0088E94D /* NSURLSession+Rx.swift */; }; D2138C971BB9BEE700339B5C /* RxCLLocationManagerDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E9A1B8A732E0088E94D /* RxCLLocationManagerDelegateProxy.swift */; }; @@ -822,7 +797,6 @@ D2EBEAE41BB9B697003A27DC /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C9E1B8A72BE0088E94D /* ObservableType.swift */; }; D2EBEAE51BB9B697003A27DC /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA01B8A72BE0088E94D /* AnyObserver.swift */; }; D2EBEAE61BB9B697003A27DC /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAB1B8A72BE0088E94D /* ObserverType.swift */; }; - D2EBEAE71BB9B697003A27DC /* ObserverType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */; }; D2EBEAE81BB9B697003A27DC /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CAF1B8A72BE0088E94D /* Rx.swift */; }; D2EBEAE91BB9B697003A27DC /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB01B8A72BE0088E94D /* RxMutableBox.swift */; }; D2EBEAEA1BB9B697003A27DC /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB31B8A72BE0088E94D /* SchedulerType.swift */; }; @@ -839,7 +813,6 @@ D2EBEAF51BB9B6AE003A27DC /* NAryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5A1B8A72BE0088E94D /* NAryDisposable.swift */; }; D2EBEAF61BB9B6B2003A27DC /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5C1B8A72BE0088E94D /* NopDisposable.swift */; }; D2EBEAF71BB9B6B2003A27DC /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5D1B8A72BE0088E94D /* ScheduledDisposable.swift */; }; - D2EBEAF81BB9B6B2003A27DC /* ScopedDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */; }; D2EBEAF91BB9B6B2003A27DC /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */; }; D2EBEAFA1BB9B6B2003A27DC /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C601B8A72BE0088E94D /* SingleAssignmentDisposable.swift */; }; D2EBEAFB1BB9B6B2003A27DC /* StableCompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C611B8A72BE0088E94D /* StableCompositeDisposable.swift */; }; @@ -901,7 +874,6 @@ D2EBEB351BB9B6D2003A27DC /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA61B8A72BE0088E94D /* ObserverBase.swift */; }; D2EBEB361BB9B6D2003A27DC /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CA91B8A72BE0088E94D /* TailRecursiveSink.swift */; }; D2EBEB381BB9B6D8003A27DC /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB51B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift */; }; - D2EBEB391BB9B6D8003A27DC /* DispatchQueueSchedulerPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */; }; D2EBEB3A1BB9B6D8003A27DC /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB71B8A72BE0088E94D /* MainScheduler.swift */; }; D2EBEB3B1BB9B6D8003A27DC /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB81B8A72BE0088E94D /* OperationQueueScheduler.swift */; }; D2EBEB3C1BB9B6D8003A27DC /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CB91B8A72BE0088E94D /* RecursiveScheduler.swift */; }; @@ -1035,7 +1007,6 @@ C8093C5B1B8A72BE0088E94D /* NAryDisposable.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NAryDisposable.tt; sourceTree = ""; }; C8093C5C1B8A72BE0088E94D /* NopDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NopDisposable.swift; sourceTree = ""; }; C8093C5D1B8A72BE0088E94D /* ScheduledDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledDisposable.swift; sourceTree = ""; }; - C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScopedDisposable.swift; sourceTree = ""; }; C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerialDisposable.swift; sourceTree = ""; }; C8093C601B8A72BE0088E94D /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleAssignmentDisposable.swift; sourceTree = ""; }; C8093C611B8A72BE0088E94D /* StableCompositeDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StableCompositeDisposable.swift; sourceTree = ""; }; @@ -1095,13 +1066,11 @@ C8093CA21B8A72BE0088E94D /* AnonymousObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnonymousObserver.swift; sourceTree = ""; }; C8093CA61B8A72BE0088E94D /* ObserverBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserverBase.swift; sourceTree = ""; }; C8093CA91B8A72BE0088E94D /* TailRecursiveSink.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TailRecursiveSink.swift; sourceTree = ""; }; - C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObserverType+Extensions.swift"; sourceTree = ""; }; C8093CAB1B8A72BE0088E94D /* ObserverType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserverType.swift; sourceTree = ""; }; C8093CAF1B8A72BE0088E94D /* Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Rx.swift; sourceTree = ""; }; C8093CB01B8A72BE0088E94D /* RxMutableBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxMutableBox.swift; sourceTree = ""; }; C8093CB31B8A72BE0088E94D /* SchedulerType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchedulerType.swift; sourceTree = ""; }; C8093CB51B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrentDispatchQueueScheduler.swift; sourceTree = ""; }; - C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DispatchQueueSchedulerPriority.swift; sourceTree = ""; }; C8093CB71B8A72BE0088E94D /* MainScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainScheduler.swift; sourceTree = ""; }; C8093CB81B8A72BE0088E94D /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperationQueueScheduler.swift; sourceTree = ""; }; C8093CB91B8A72BE0088E94D /* RecursiveScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecursiveScheduler.swift; sourceTree = ""; }; @@ -1126,7 +1095,6 @@ C8093E931B8A732E0088E94D /* KVOObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObservable.swift; sourceTree = ""; }; C8093E941B8A732E0088E94D /* KVOObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObserver.swift; sourceTree = ""; }; C8093E951B8A732E0088E94D /* NSNotificationCenter+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSNotificationCenter+Rx.swift"; sourceTree = ""; }; - C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx+CoreGraphics.swift"; sourceTree = ""; }; C8093E971B8A732E0088E94D /* NSObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = ""; }; C8093E981B8A732E0088E94D /* NSURLSession+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Rx.swift"; sourceTree = ""; }; C8093E9A1B8A732E0088E94D /* RxCLLocationManagerDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCLLocationManagerDelegateProxy.swift; sourceTree = ""; }; @@ -1180,8 +1148,6 @@ C88253F41B8A752B00B02D69 /* ItemEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemEvents.swift; sourceTree = ""; }; C88253F71B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDataSourceType.swift; sourceTree = ""; }; C88253F81B8A752B00B02D69 /* RxTableViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDataSourceType.swift; sourceTree = ""; }; - C88253FA1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxActionSheetDelegateProxy.swift; sourceTree = ""; }; - C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAlertViewDelegateProxy.swift; sourceTree = ""; }; C88253FC1B8A752B00B02D69 /* RxCollectionViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDataSourceProxy.swift; sourceTree = ""; }; C88253FD1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDelegateProxy.swift; sourceTree = ""; }; C88253FE1B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxScrollViewDelegateProxy.swift; sourceTree = ""; }; @@ -1189,8 +1155,6 @@ C88254001B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDataSourceProxy.swift; sourceTree = ""; }; C88254011B8A752B00B02D69 /* RxTableViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDelegateProxy.swift; sourceTree = ""; }; C88254021B8A752B00B02D69 /* RxTextViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextViewDelegateProxy.swift; sourceTree = ""; }; - C88254031B8A752B00B02D69 /* UIActionSheet+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIActionSheet+Rx.swift"; sourceTree = ""; }; - C88254041B8A752B00B02D69 /* UIAlertView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIAlertView+Rx.swift"; sourceTree = ""; }; C88254051B8A752B00B02D69 /* UIBarButtonItem+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "UIBarButtonItem+Rx.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; C88254061B8A752B00B02D69 /* UIButton+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Rx.swift"; sourceTree = ""; }; C88254071B8A752B00B02D69 /* UICollectionView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Rx.swift"; sourceTree = ""; }; @@ -1408,7 +1372,6 @@ C8093C9E1B8A72BE0088E94D /* ObservableType.swift */, C8093CA01B8A72BE0088E94D /* AnyObserver.swift */, C8093CAB1B8A72BE0088E94D /* ObserverType.swift */, - C8093CAA1B8A72BE0088E94D /* ObserverType+Extensions.swift */, C8093CAF1B8A72BE0088E94D /* Rx.swift */, C8093CB01B8A72BE0088E94D /* RxMutableBox.swift */, C8093CB31B8A72BE0088E94D /* SchedulerType.swift */, @@ -1465,7 +1428,6 @@ C8093C5C1B8A72BE0088E94D /* NopDisposable.swift */, CB883B3F1BE24C15000AC2EE /* RefCountDisposable.swift */, C8093C5D1B8A72BE0088E94D /* ScheduledDisposable.swift */, - C8093C5E1B8A72BE0088E94D /* ScopedDisposable.swift */, C8093C5F1B8A72BE0088E94D /* SerialDisposable.swift */, C8093C601B8A72BE0088E94D /* SingleAssignmentDisposable.swift */, C8093C611B8A72BE0088E94D /* StableCompositeDisposable.swift */, @@ -1576,7 +1538,6 @@ C8093CB51B8A72BE0088E94D /* ConcurrentDispatchQueueScheduler.swift */, C8B144FA1BD2D44500267DCE /* ConcurrentMainScheduler.swift */, C8C3DA0E1B939767004D233E /* CurrentThreadScheduler.swift */, - C8093CB61B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift */, 79E9DE881C3417FD009970AF /* DispatchQueueSchedulerQOS.swift */, C8B144FF1BD2D80100267DCE /* ImmediateScheduler.swift */, C8093CB71B8A72BE0088E94D /* MainScheduler.swift */, @@ -1650,7 +1611,6 @@ children = ( C8093E8F1B8A732E0088E94D /* Implementations */, C8093E951B8A732E0088E94D /* NSNotificationCenter+Rx.swift */, - C8093E961B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift */, C8093E971B8A732E0088E94D /* NSObject+Rx.swift */, C8F6A1441BF0B9B1007DF367 /* NSObject+Rx+RawRepresentable.swift */, C8DB96821BF754C80084BD53 /* NSObject+Rx+KVORepresentable.swift */, @@ -1758,8 +1718,6 @@ C88253F31B8A752B00B02D69 /* Events */, C88253F61B8A752B00B02D69 /* Protocols */, C88253F91B8A752B00B02D69 /* Proxies */, - C88254031B8A752B00B02D69 /* UIActionSheet+Rx.swift */, - C88254041B8A752B00B02D69 /* UIAlertView+Rx.swift */, C88254051B8A752B00B02D69 /* UIBarButtonItem+Rx.swift */, C88254061B8A752B00B02D69 /* UIButton+Rx.swift */, C88254071B8A752B00B02D69 /* UICollectionView+Rx.swift */, @@ -1812,8 +1770,6 @@ C88253F91B8A752B00B02D69 /* Proxies */ = { isa = PBXGroup; children = ( - C88253FA1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift */, - C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */, C88253FC1B8A752B00B02D69 /* RxCollectionViewDataSourceProxy.swift */, C88253FD1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift */, C88253FE1B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift */, @@ -2527,7 +2483,6 @@ F31F35B01BB4FED800961002 /* UIStepper+Rx.swift in Sources */, C882542D1B8A752B00B02D69 /* UIImageView+Rx.swift in Sources */, C80D33981B922FB00014629D /* ControlEvent.swift in Sources */, - C8093EF31B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift in Sources */, C882542A1B8A752B00B02D69 /* UIControl+Rx.swift in Sources */, C8F6A1451BF0B9B1007DF367 /* NSObject+Rx+RawRepresentable.swift in Sources */, C8DB967E1BF7496C0084BD53 /* KVORepresentable.swift in Sources */, @@ -2536,12 +2491,10 @@ C88254161B8A752B00B02D69 /* RxCollectionViewReactiveArrayDataSource.swift in Sources */, C8C4B4A91C17722400828BD5 /* _RXObjCRuntime.m in Sources */, C8093EEF1B8A732E0088E94D /* KVOObserver.swift in Sources */, - C88254261B8A752B00B02D69 /* UIAlertView+Rx.swift in Sources */, C882541F1B8A752B00B02D69 /* RxCollectionViewDelegateProxy.swift in Sources */, C88254201B8A752B00B02D69 /* RxScrollViewDelegateProxy.swift in Sources */, C882542E1B8A752B00B02D69 /* UILabel+Rx.swift in Sources */, C88254211B8A752B00B02D69 /* RxSearchBarDelegateProxy.swift in Sources */, - C882541D1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift in Sources */, C80DDEA71BCE69BA006A1832 /* ObservableConvertibleType+Driver.swift in Sources */, C80DDE9F1BCE69BA006A1832 /* Driver+Subscription.swift in Sources */, C811C89D1C24D80100A2DDD4 /* DeallocObservable.swift in Sources */, @@ -2554,13 +2507,11 @@ C88254281B8A752B00B02D69 /* UIButton+Rx.swift in Sources */, C8093EDF1B8A732E0088E94D /* CLLocationManager+Rx.swift in Sources */, C80DDEA31BCE69BA006A1832 /* Driver.swift in Sources */, - C882541C1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift in Sources */, C8093ED51B8A732E0088E94D /* _RXDelegateProxy.m in Sources */, C8093EF51B8A732E0088E94D /* NSObject+Rx.swift in Sources */, 9BA1CBD31C0F7D550044B50A /* UIActivityIndicatorView+Rx.swift in Sources */, C88254241B8A752B00B02D69 /* RxTextViewDelegateProxy.swift in Sources */, C88254271B8A752B00B02D69 /* UIBarButtonItem+Rx.swift in Sources */, - C88254251B8A752B00B02D69 /* UIActionSheet+Rx.swift in Sources */, C8C4B4C21C17727000828BD5 /* MessageSentObserver.swift in Sources */, C80D339A1B922FB00014629D /* ControlProperty.swift in Sources */, C882542B1B8A752B00B02D69 /* UIDatePicker+Rx.swift in Sources */, @@ -2605,7 +2556,6 @@ C80DDEA81BCE69BA006A1832 /* ObservableConvertibleType+Driver.swift in Sources */, C80D339B1B922FB00014629D /* ControlProperty.swift in Sources */, C8BCD3F51C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */, - C8093EF41B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift in Sources */, C8093EF01B8A732E0088E94D /* KVOObserver.swift in Sources */, C8093EEE1B8A732E0088E94D /* KVOObservable.swift in Sources */, C8F6A1461BF0B9B2007DF367 /* NSObject+Rx+RawRepresentable.swift in Sources */, @@ -2724,7 +2674,6 @@ C84CC54F1BDCF48200E06A64 /* LockOwnerType.swift in Sources */, D2752D621BC5551A0070C418 /* SkipUntil.swift in Sources */, C84CC5541BDCF49300E06A64 /* SynchronizedOnType.swift in Sources */, - C8093CEA1B8A72BE0088E94D /* ScopedDisposable.swift in Sources */, C8093D261B8A72BE0088E94D /* Multicast.swift in Sources */, C8C3DA101B939767004D233E /* CurrentThreadScheduler.swift in Sources */, C8093D861B8A72BE0088E94D /* Rx.swift in Sources */, @@ -2741,7 +2690,6 @@ C8093DA81B8A72BE0088E94D /* Variable.swift in Sources */, C84CC5631BDD037900E06A64 /* SynchronizedDisposeType.swift in Sources */, C8093D961B8A72BE0088E94D /* OperationQueueScheduler.swift in Sources */, - C8093D921B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift in Sources */, C8093D081B8A72BE0088E94D /* CombineLatest+arity.swift in Sources */, C8093CDE1B8A72BE0088E94D /* DisposeBag.swift in Sources */, C8093D981B8A72BE0088E94D /* RecursiveScheduler.swift in Sources */, @@ -2798,7 +2746,6 @@ C8093CE21B8A72BE0088E94D /* NAryDisposable.swift in Sources */, C8093CEC1B8A72BE0088E94D /* SerialDisposable.swift in Sources */, C8C3DA0D1B93959F004D233E /* Never.swift in Sources */, - C8093D7C1B8A72BE0088E94D /* ObserverType+Extensions.swift in Sources */, C84CC5681BDD08A500E06A64 /* SubscriptionDisposable.swift in Sources */, C8093CF61B8A72BE0088E94D /* Event.swift in Sources */, C83D73C51C1DBAEE003DC470 /* ScheduledItem.swift in Sources */, @@ -2948,7 +2895,6 @@ C8FA89151C30405400CD3A17 /* VirtualTimeScheduler.swift in Sources */, D285BAC41BC0231000B3F602 /* SkipUntil.swift in Sources */, C84CC5531BDCF49300E06A64 /* SynchronizedOnType.swift in Sources */, - C8093CE91B8A72BE0088E94D /* ScopedDisposable.swift in Sources */, C8093D251B8A72BE0088E94D /* Multicast.swift in Sources */, C8C3DA0F1B939767004D233E /* CurrentThreadScheduler.swift in Sources */, C8093D851B8A72BE0088E94D /* Rx.swift in Sources */, @@ -2966,7 +2912,6 @@ C8093DA71B8A72BE0088E94D /* Variable.swift in Sources */, C84CC5621BDD037900E06A64 /* SynchronizedDisposeType.swift in Sources */, C8093D951B8A72BE0088E94D /* OperationQueueScheduler.swift in Sources */, - C8093D911B8A72BE0088E94D /* DispatchQueueSchedulerPriority.swift in Sources */, C8093D071B8A72BE0088E94D /* CombineLatest+arity.swift in Sources */, C8093CDD1B8A72BE0088E94D /* DisposeBag.swift in Sources */, C8093D971B8A72BE0088E94D /* RecursiveScheduler.swift in Sources */, @@ -3023,7 +2968,6 @@ C8093CE11B8A72BE0088E94D /* NAryDisposable.swift in Sources */, C8093CEB1B8A72BE0088E94D /* SerialDisposable.swift in Sources */, C8C3DA0C1B93959F004D233E /* Never.swift in Sources */, - C8093D7B1B8A72BE0088E94D /* ObserverType+Extensions.swift in Sources */, C84CC5671BDD08A500E06A64 /* SubscriptionDisposable.swift in Sources */, C8093CF51B8A72BE0088E94D /* Event.swift in Sources */, C83D73C41C1DBAEE003DC470 /* ScheduledItem.swift in Sources */, @@ -3098,7 +3042,6 @@ C84CC5511BDCF48200E06A64 /* LockOwnerType.swift in Sources */, D21C29311BC6A1C300448E70 /* SkipUntil.swift in Sources */, C84CC5561BDCF49300E06A64 /* SynchronizedOnType.swift in Sources */, - C8F0BFB91BBBFB8B001B112F /* ScopedDisposable.swift in Sources */, C8F0BFBA1BBBFB8B001B112F /* Multicast.swift in Sources */, C8F0BFBB1BBBFB8B001B112F /* CurrentThreadScheduler.swift in Sources */, C8F0BFBC1BBBFB8B001B112F /* Rx.swift in Sources */, @@ -3115,7 +3058,6 @@ C8F0BFC51BBBFB8B001B112F /* Variable.swift in Sources */, C84CC5651BDD037900E06A64 /* SynchronizedDisposeType.swift in Sources */, C8F0BFC61BBBFB8B001B112F /* OperationQueueScheduler.swift in Sources */, - C8F0BFC71BBBFB8B001B112F /* DispatchQueueSchedulerPriority.swift in Sources */, C8F0BFC81BBBFB8B001B112F /* CombineLatest+arity.swift in Sources */, C8F0BFC91BBBFB8B001B112F /* DisposeBag.swift in Sources */, C8F0BFCA1BBBFB8B001B112F /* RecursiveScheduler.swift in Sources */, @@ -3172,7 +3114,6 @@ C8F0BFF51BBBFB8B001B112F /* NAryDisposable.swift in Sources */, C8F0BFF61BBBFB8B001B112F /* SerialDisposable.swift in Sources */, C8F0BFF71BBBFB8B001B112F /* Never.swift in Sources */, - C8F0BFF81BBBFB8B001B112F /* ObserverType+Extensions.swift in Sources */, C84CC56A1BDD08A500E06A64 /* SubscriptionDisposable.swift in Sources */, C8F0BFF91BBBFB8B001B112F /* Event.swift in Sources */, C83D73C71C1DBAEE003DC470 /* ScheduledItem.swift in Sources */, @@ -3201,7 +3142,6 @@ C8F0C0111BBBFBB9001B112F /* UIStepper+Rx.swift in Sources */, C8F0C0121BBBFBB9001B112F /* UIImageView+Rx.swift in Sources */, C8F0C0131BBBFBB9001B112F /* ControlEvent.swift in Sources */, - C8F0C0141BBBFBB9001B112F /* NSObject+Rx+CoreGraphics.swift in Sources */, C8F0C0151BBBFBB9001B112F /* UIControl+Rx.swift in Sources */, C8F6A1481BF0B9B2007DF367 /* NSObject+Rx+RawRepresentable.swift in Sources */, C8DB96811BF7496C0084BD53 /* KVORepresentable.swift in Sources */, @@ -3210,12 +3150,10 @@ C8F0C0171BBBFBB9001B112F /* RxCollectionViewReactiveArrayDataSource.swift in Sources */, C8C4B4AC1C17722400828BD5 /* _RXObjCRuntime.m in Sources */, C8F0C0181BBBFBB9001B112F /* KVOObserver.swift in Sources */, - C8F0C0191BBBFBB9001B112F /* UIAlertView+Rx.swift in Sources */, C8F0C01A1BBBFBB9001B112F /* RxCollectionViewDelegateProxy.swift in Sources */, C8F0C01B1BBBFBB9001B112F /* RxScrollViewDelegateProxy.swift in Sources */, C8F0C01C1BBBFBB9001B112F /* UILabel+Rx.swift in Sources */, C8F0C01D1BBBFBB9001B112F /* RxSearchBarDelegateProxy.swift in Sources */, - C8F0C01E1BBBFBB9001B112F /* RxAlertViewDelegateProxy.swift in Sources */, C80DDEAA1BCE69BA006A1832 /* ObservableConvertibleType+Driver.swift in Sources */, C80DDEA21BCE69BA006A1832 /* Driver+Subscription.swift in Sources */, C811C8A01C24D80100A2DDD4 /* DeallocObservable.swift in Sources */, @@ -3228,13 +3166,11 @@ C8F0C0221BBBFBB9001B112F /* UIButton+Rx.swift in Sources */, C8F0C0231BBBFBB9001B112F /* CLLocationManager+Rx.swift in Sources */, C80DDEA61BCE69BA006A1832 /* Driver.swift in Sources */, - C8F0C0251BBBFBB9001B112F /* RxActionSheetDelegateProxy.swift in Sources */, C8F0C0261BBBFBB9001B112F /* _RXDelegateProxy.m in Sources */, C8F0C0271BBBFBB9001B112F /* NSObject+Rx.swift in Sources */, 9BA1CBFE1C0F84C40044B50A /* UIActivityIndicatorView+Rx.swift in Sources */, C8F0C0281BBBFBB9001B112F /* RxTextViewDelegateProxy.swift in Sources */, C8F0C0291BBBFBB9001B112F /* UIBarButtonItem+Rx.swift in Sources */, - C8F0C02A1BBBFBB9001B112F /* UIActionSheet+Rx.swift in Sources */, C8C4B4C51C17727000828BD5 /* MessageSentObserver.swift in Sources */, C8F0C02B1BBBFBB9001B112F /* ControlProperty.swift in Sources */, C8F0C02C1BBBFBB9001B112F /* UIDatePicker+Rx.swift in Sources */, @@ -3275,7 +3211,6 @@ buildActionMask = 2147483647; files = ( D203C4F71BB9C53100D02D00 /* RxTableViewDataSourceType.swift in Sources */, - D203C5021BB9C53E00D02D00 /* UIAlertView+Rx.swift in Sources */, D203C50E1BB9C53E00D02D00 /* UISlider+Rx.swift in Sources */, C80DDE9D1BCE69BA006A1832 /* Driver+Operators.swift in Sources */, D2138C8C1BB9BECA00339B5C /* ControlEvent.swift in Sources */, @@ -3292,7 +3227,6 @@ D2138C881BB9BEBE00339B5C /* DelegateProxy.swift in Sources */, D203C5101BB9C53E00D02D00 /* UISwitch+Rx.swift in Sources */, D203C5121BB9C53E00D02D00 /* UITextField+Rx.swift in Sources */, - D203C4F91BB9C53700D02D00 /* RxAlertViewDelegateProxy.swift in Sources */, C8F6A1471BF0B9B2007DF367 /* NSObject+Rx+RawRepresentable.swift in Sources */, C8DB96801BF7496C0084BD53 /* KVORepresentable.swift in Sources */, C849EF8D1C3195950048AC4A /* Variable+Driver.swift in Sources */, @@ -3317,13 +3251,11 @@ D203C5061BB9C53E00D02D00 /* UIControl+Rx.swift in Sources */, D203C5111BB9C53E00D02D00 /* UITableView+Rx.swift in Sources */, C80DDEA51BCE69BA006A1832 /* Driver.swift in Sources */, - D203C4F81BB9C53700D02D00 /* RxActionSheetDelegateProxy.swift in Sources */, D2138C961BB9BEDA00339B5C /* NSURLSession+Rx.swift in Sources */, D203C5051BB9C53E00D02D00 /* UICollectionView+Rx.swift in Sources */, D2138C8D1BB9BECD00339B5C /* ControlProperty.swift in Sources */, 9BA1CBFD1C0F84A10044B50A /* UIActivityIndicatorView+Rx.swift in Sources */, D203C5071BB9C53E00D02D00 /* UIDatePicker+Rx.swift in Sources */, - D2138C941BB9BEDA00339B5C /* NSObject+Rx+CoreGraphics.swift in Sources */, D203C50D1BB9C53E00D02D00 /* UISegmentedControl+Rx.swift in Sources */, C8C4B4C41C17727000828BD5 /* MessageSentObserver.swift in Sources */, D2138C861BB9BEBE00339B5C /* Observable+Bind.swift in Sources */, @@ -3343,7 +3275,6 @@ 9D71C4D21BF08191006E8F59 /* UIButton+Rx.swift in Sources */, D203C4FD1BB9C53700D02D00 /* RxSearchBarDelegateProxy.swift in Sources */, D2138C8A1BB9BEBE00339B5C /* Logging.swift in Sources */, - D203C5011BB9C53E00D02D00 /* UIActionSheet+Rx.swift in Sources */, C8DB968A1BF756F40084BD53 /* KVORepresentable+CoreGraphics.swift in Sources */, D203C50F1BB9C53E00D02D00 /* UIStepper+Rx.swift in Sources */, ); @@ -3369,7 +3300,6 @@ C8B144FD1BD2D44500267DCE /* ConcurrentMainScheduler.swift in Sources */, D2EBEB1B1BB9B6C1003A27DC /* Repeat.swift in Sources */, D2245A1D1BD63C4700E7146F /* WithLatestFrom.swift in Sources */, - D2EBEAF81BB9B6B2003A27DC /* ScopedDisposable.swift in Sources */, CB883B3D1BE24355000AC2EE /* Window.swift in Sources */, C8FA89191C30409900CD3A17 /* HistoricalScheduler.swift in Sources */, D2EBEAEA1BB9B697003A27DC /* SchedulerType.swift in Sources */, @@ -3421,7 +3351,6 @@ D2EBEB0F1BB9B6C1003A27DC /* Generate.swift in Sources */, D2EBEB1F1BB9B6C1003A27DC /* Skip.swift in Sources */, D2EBEB321BB9B6CA003A27DC /* Observable+StandardSequenceOperators.swift in Sources */, - D2EBEB391BB9B6D8003A27DC /* DispatchQueueSchedulerPriority.swift in Sources */, C84CC5421BDC3B3E00E06A64 /* ElementAt.swift in Sources */, D2EBEB081BB9B6C1003A27DC /* DelaySubscription.swift in Sources */, D2EBEADE1BB9B697003A27DC /* Disposable.swift in Sources */, @@ -3461,7 +3390,6 @@ D2EBEB121BB9B6C1003A27DC /* Merge.swift in Sources */, D2EBEAEF1BB9B6A4003A27DC /* Queue.swift in Sources */, D2EBEB301BB9B6CA003A27DC /* Observable+Multiple.swift in Sources */, - D2EBEAE71BB9B697003A27DC /* ObserverType+Extensions.swift in Sources */, D2EBEB2B1BB9B6CA003A27DC /* Observable+Aggregate.swift in Sources */, D2EBEB291BB9B6C1003A27DC /* Zip+arity.swift in Sources */, D2EBEB241BB9B6C1003A27DC /* TakeUntil.swift in Sources */, diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.swift b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.swift index 6df6592b..dde0f053 100644 --- a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.swift +++ b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.swift @@ -16,16 +16,6 @@ import RxSwift // 2 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, resultSelector: (O1.E, O2.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -46,16 +36,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, resultSelector: (O1.E, O2.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -80,16 +60,6 @@ extension Driver { // 3 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, resultSelector: (O1.E, O2.E, O3.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -110,16 +80,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, resultSelector: (O1.E, O2.E, O3.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -144,16 +104,6 @@ extension Driver { // 4 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: (O1.E, O2.E, O3.E, O4.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, source4, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -174,16 +124,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: (O1.E, O2.E, O3.E, O4.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, source4, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -208,16 +148,6 @@ extension Driver { // 5 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, source4, source5, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -238,16 +168,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, source4, source5, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -272,16 +192,6 @@ extension Driver { // 6 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, source4, source5, source6, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -302,16 +212,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, source4, source5, source6, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -336,16 +236,6 @@ extension Driver { // 7 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, source4, source5, source6, source7, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -366,16 +256,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, source4, source5, source6, source7, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -400,16 +280,6 @@ extension Driver { // 8 -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> R) - -> Driver { - return Driver.zip( - source1, source2, source3, source4, source5, source6, source7, source8, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -430,16 +300,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> R) - -> Driver { - return Driver.combineLatest( - source1, source2, source3, source4, source5, source6, source7, source8, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.tt b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.tt index a8f5f5f0..8e1a4dc2 100644 --- a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.tt +++ b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators+arity.tt @@ -15,16 +15,6 @@ import RxSwift // <%= i %> -@available(*, deprecated=2.0.0, message="Please use `Driver.zip`") -public func zip<<%= (Array(1...i).map { "O\($0): DriverConvertibleType" }).joinWithSeparator(", ") %>, R> -(<%= (Array(1...i).map { "source\($0): O\($0)" }).joinWithSeparator(", _ ") %>, resultSelector: (<%= (Array(1...i).map { "O\($0).E" }).joinWithSeparator(", ") %>) throws -> R) - -> Driver { - return Driver.zip( - <%= (Array(1...i).map { "source\($0)" }).joinWithSeparator(", ") %>, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -45,16 +35,6 @@ extension Driver { } } -@available(*, deprecated=2.0.0, message="Please use `Driver.combineLatest`") -public func combineLatest<<%= (Array(1...i).map { "O\($0): DriverConvertibleType" }).joinWithSeparator(", ") %>, R> -(<%= (Array(1...i).map { "source\($0): O\($0)" }).joinWithSeparator(", _ ") %>, resultSelector: (<%= (Array(1...i).map { "O\($0).E" }).joinWithSeparator(", ") %>) throws -> R) - -> Driver { - return Driver.combineLatest( - <%= (Array(1...i).map { "source\($0)" }).joinWithSeparator(", ") %>, - resultSelector: resultSelector - ) -} - extension Driver { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators.swift b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators.swift index 1079e266..d56ffde3 100644 --- a/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators.swift +++ b/RxCocoa/Common/CocoaUnits/Driver/Driver+Operators.swift @@ -284,15 +284,6 @@ extension DriverConvertibleType { return Driver(source) } - @available(*, deprecated=2.0.0, message="Please use version without scheduler parameter.") - public func throttle(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Driver { - let source = self.asObservable() - .throttle(dueTime, scheduler: scheduler) - - return Driver(source) - } - /** Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers. @@ -309,15 +300,6 @@ extension DriverConvertibleType { return Driver(source) } - - @available(*, deprecated=2.0.0, message="Please use version without scheduler parameter.") - public func debounce(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Driver { - let source = self.asObservable() - .debounce(dueTime, scheduler: scheduler) - - return Driver(source) - } } // scan diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift index 04976af3..2b6fed56 100644 --- a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift +++ b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift @@ -143,37 +143,6 @@ extension Driver { } -public struct Drive { - - @available(*, deprecated=2.0.0, message="Please use `Driver.empty` (`r` at the end).") - public static func empty() -> Driver { - return Driver(raw: Observable.empty().subscribeOn(driverSubscribeOnScheduler)) - } - - @available(*, deprecated=2.0.0, message="Please use `Driver.never` (`r` at the end).") - public static func never() -> Driver { - return Driver(raw: Observable.never().subscribeOn(driverSubscribeOnScheduler)) - } - - @available(*, deprecated=2.0.0, message="Please use `Driver.just` (`r` at the end).") - public static func just(element: E) -> Driver { - return Driver(raw: Observable.just(element).subscribeOn(driverSubscribeOnScheduler)) - } - - @available(*, deprecated=2.0.0, message="Please use `Driver.deferred` (`r` at the end).") - public static func deferred(observableFactory: () -> Driver) - -> Driver { - return Driver(Observable.deferred { observableFactory().asObservable() }) - } - - @available(*, deprecated=2.0.0, message="Please use `Driver.of` (`r` at the end).") - public static func sequenceOf(elements: E ...) -> Driver { - let source = elements.toObservable().subscribeOn(driverSubscribeOnScheduler) - return Driver(raw: source) - } - -} - /** This method can be used in unit tests to ensure that driver is using mock schedulers instead of maind schedulers. diff --git a/RxCocoa/Common/DelegateProxyType.swift b/RxCocoa/Common/DelegateProxyType.swift index 63a357f8..57c92ca6 100644 --- a/RxCocoa/Common/DelegateProxyType.swift +++ b/RxCocoa/Common/DelegateProxyType.swift @@ -193,11 +193,6 @@ public func proxyForObject(type: P.Type, _ object: AnyObje return proxy } -@available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") -public func proxyForObject(object: AnyObject) -> P { - return proxyForObject(P.self, object) -} - func installDelegate(proxy: P, delegate: AnyObject, retainDelegate: Bool, onProxyForObject object: AnyObject) -> Disposable { weak var weakDelegate: AnyObject? = delegate diff --git a/RxCocoa/Common/Observables/NSObject+Rx+CoreGraphics.swift b/RxCocoa/Common/Observables/NSObject+Rx+CoreGraphics.swift deleted file mode 100644 index acb62390..00000000 --- a/RxCocoa/Common/Observables/NSObject+Rx+CoreGraphics.swift +++ /dev/null @@ -1,97 +0,0 @@ -// -// NSObject+Rx+CoreGraphics.swift -// RxCocoa -// -// Created by Krunoslav Zaher on 7/30/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -import Foundation -#if !RX_NO_MODULE -import RxSwift -#endif -import CoreGraphics - -// MARK: Deprecated, CGPoint, CGRect, CGSize are now KVORepresentable - -extension NSObject { - /** - Specialization of generic `rx_observe` method. - - For more information take a look at `rx_observe` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observe(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable { - return rx_observe(NSValue.self, keyPath, options: options, retainSelf: retainSelf) - .map(CGRect.init) - } - - /** - Specialization of generic `rx_observe` method. - - For more information take a look at `rx_observe` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observe(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable { - return rx_observe(NSValue.self, keyPath, options: options, retainSelf: retainSelf) - .map(CGSize.init) - } - - /** - Specialization of generic `rx_observe` method. - - For more information take a look at `rx_observe` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observe(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable { - return rx_observe(NSValue.self, keyPath, options: options, retainSelf: retainSelf) - .map(CGPoint.init) - } -} - -#if !DISABLE_SWIZZLING - -// rx_observeWeakly + CoreGraphics -extension NSObject { - - /** - Specialization of generic `rx_observeWeakly` method. - - For more information take a look at `rx_observeWeakly` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observeWeakly(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial]) -> Observable { - return rx_observeWeakly(NSValue.self, keyPath, options: options) - .map(CGRect.init) - } - - /** - Specialization of generic `rx_observeWeakly` method. - - For more information take a look at `rx_observeWeakly` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observeWeakly(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial]) -> Observable { - return rx_observeWeakly(NSValue.self, keyPath, options: options) - .map(CGSize.init) - } - - /** - Specialization of generic `rx_observeWeakly` method. - - For more information take a look at `rx_observeWeakly` method. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_observeWeakly(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial]) -> Observable { - return rx_observeWeakly(NSValue.self, keyPath, options: options) - .map(CGPoint.init) - } -} - -#endif diff --git a/RxCocoa/Common/Observables/NSObject+Rx.swift b/RxCocoa/Common/Observables/NSObject+Rx.swift index a69309d0..d2dec6d1 100644 --- a/RxCocoa/Common/Observables/NSObject+Rx.swift +++ b/RxCocoa/Common/Observables/NSObject+Rx.swift @@ -62,31 +62,6 @@ extension NSObject { public func rx_observe(type: E.Type, _ keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable { return KVOObservable(object: self, keyPath: keyPath, options: options, retainTarget: retainSelf).asObservable() } - - - /** - Observes values on `keyPath` starting from `self` with `options` and retains `self` if `retainSelf` is set. - - `rx_observe` is just a simple and performant wrapper around KVO mechanism. - - * it can be used to observe paths starting from `self` or from ancestors in ownership graph (`retainSelf = false`) - * it can be used to observe paths starting from descendants in ownership graph (`retainSelf = true`) - * the paths have to consist only of `strong` properties, otherwise you are risking crashing the system by not unregistering KVO observer before dealloc. - - If support for weak properties is needed or observing arbitrary or unknown relationships in the - ownership tree, `rx_observeWeakly` is the preferred option. - - - parameter keyPath: Key path of property names to observe. - - parameter options: KVO mechanism notification options. - - parameter retainSelf: Retains self during observation if set `true`. - - returns: Observable sequence of objects on `keyPath`. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument `rx_observe(type: Element.Type, _ keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable`") - public func rx_observe(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial], retainSelf: Bool = true) -> Observable { - return KVOObservable(object: self, keyPath: keyPath, options: options, retainTarget: retainSelf).asObservable() - } - } #if !DISABLE_SWIZZLING @@ -113,29 +88,6 @@ extension NSObject { return n as? E } } - - /** - Observes values on `keyPath` starting from `self` with `options` and doesn't retain `self`. - - It can be used in all cases where `rx_observe` can be used and additionally - - * because it won't retain observed target, it can be used to observe arbitrary object graph whose ownership relation is unknown - * it can be used to observe `weak` properties - - **Since it needs to intercept object deallocation process it needs to perform swizzling of `dealloc` method on observed object.** - - - parameter keyPath: Key path of property names to observe. - - parameter options: KVO mechanism notification options. - - returns: Observable sequence of objects on `keyPath`. - */ - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument `rx_observeWeakly(type: Element.Type, keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial]) -> Observable`") - @warn_unused_result(message="http://git.io/rxs.uo") - public func rx_observeWeakly(keyPath: String, options: NSKeyValueObservingOptions = [.New, .Initial]) -> Observable { - return observeWeaklyKeyPathFor(self, keyPath: keyPath, options: options) - .map { n in - return n as? Element - } - } } #endif diff --git a/RxCocoa/OSX/NSButton+Rx.swift b/RxCocoa/OSX/NSButton+Rx.swift index 356f13fe..460baef2 100644 --- a/RxCocoa/OSX/NSButton+Rx.swift +++ b/RxCocoa/OSX/NSButton+Rx.swift @@ -18,6 +18,6 @@ extension NSButton { Reactive wrapper for control event. */ public var rx_tap: ControlEvent { - return rx_controlEvents + return rx_controlEvent } } \ No newline at end of file diff --git a/RxCocoa/OSX/NSControl+Rx.swift b/RxCocoa/OSX/NSControl+Rx.swift index c017d3a3..9aabdae2 100644 --- a/RxCocoa/OSX/NSControl+Rx.swift +++ b/RxCocoa/OSX/NSControl+Rx.swift @@ -17,11 +17,6 @@ var rx_control_events_key: UInt8 = 0 extension NSControl { - @available(*, deprecated=2.0.0, message="Please use rx_controlEvent.") - public var rx_controlEvents: ControlEvent { - return rx_controlEvent - } - /** Reactive wrapper for control event. */ diff --git a/RxCocoa/iOS/Proxies/RxActionSheetDelegateProxy.swift b/RxCocoa/iOS/Proxies/RxActionSheetDelegateProxy.swift deleted file mode 100644 index d71def5b..00000000 --- a/RxCocoa/iOS/Proxies/RxActionSheetDelegateProxy.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// RxActionSheetDelegateProxy.swift -// RxCocoa -// -// Created by Carlos García on 8/7/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#if os(iOS) - -import UIKit -#if !RX_NO_MODULE -import RxSwift -#endif - -@available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") -class RxActionSheetDelegateProxy : DelegateProxy - , UIActionSheetDelegate - , DelegateProxyType { - - class func currentDelegateFor(object: AnyObject) -> AnyObject? { - let actionSheet: UIActionSheet = castOrFatalError(object) - return actionSheet.delegate - } - - class func setCurrentDelegate(delegate: AnyObject?, toObject object: AnyObject) { - let actionSheet: UIActionSheet = castOrFatalError(object) - actionSheet.delegate = castOptionalOrFatalError(delegate) - } -} - -#endif diff --git a/RxCocoa/iOS/Proxies/RxAlertViewDelegateProxy.swift b/RxCocoa/iOS/Proxies/RxAlertViewDelegateProxy.swift deleted file mode 100644 index ff04e492..00000000 --- a/RxCocoa/iOS/Proxies/RxAlertViewDelegateProxy.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// RxAlertViewDelegateProxy.swift -// RxCocoa -// -// Created by Carlos García on 8/7/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#if os(iOS) - -import UIKit -#if !RX_NO_MODULE -import RxSwift -#endif - -@available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") -class RxAlertViewDelegateProxy : DelegateProxy - , UIAlertViewDelegate - , DelegateProxyType { - - class func currentDelegateFor(object: AnyObject) -> AnyObject? { - let alertView: UIAlertView = castOrFatalError(object) - return alertView.delegate - } - - class func setCurrentDelegate(delegate: AnyObject?, toObject object: AnyObject) { - let alertView: UIAlertView = castOrFatalError(object) - alertView.delegate = castOptionalOrFatalError(delegate) - } -} - -#endif - diff --git a/RxCocoa/iOS/UIActionSheet+Rx.swift b/RxCocoa/iOS/UIActionSheet+Rx.swift deleted file mode 100644 index 781e0798..00000000 --- a/RxCocoa/iOS/UIActionSheet+Rx.swift +++ /dev/null @@ -1,69 +0,0 @@ -// -// UIActionSheet+Rx.swift -// RxCocoa -// -// Created by Carlos García on 8/7/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#if os(iOS) - -import UIKit -#if !RX_NO_MODULE -import RxSwift -#endif - - -extension UIActionSheet { - - /** - Reactive wrapper for `delegate`. - - For more information take a look at `DelegateProxyType` protocol documentation. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_delegate: DelegateProxy { - return proxyForObject(RxActionSheetDelegateProxy.self, self) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_clickedButtonAtIndex: ControlEvent { - let source = rx_delegate.observe("actionSheet:clickedButtonAtIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_willDismissWithButtonIndex: ControlEvent { - let source = rx_delegate.observe("actionSheet:willDismissWithButtonIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_didDismissWithButtonIndex: ControlEvent { - let source = rx_delegate.observe("actionSheet:didDismissWithButtonIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } -} - -#endif diff --git a/RxCocoa/iOS/UIAlertView+Rx.swift b/RxCocoa/iOS/UIAlertView+Rx.swift deleted file mode 100644 index 9e3fb797..00000000 --- a/RxCocoa/iOS/UIAlertView+Rx.swift +++ /dev/null @@ -1,68 +0,0 @@ -// -// UIAlertView+Rx.swift -// RxCocoa -// -// Created by Carlos García on 8/7/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#if os(iOS) - -import UIKit -#if !RX_NO_MODULE -import RxSwift -#endif - -extension UIAlertView { - - /** - Reactive wrapper for `delegate`. - - For more information take a look at `DelegateProxyType` protocol documentation. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_delegate: DelegateProxy { - return proxyForObject(RxAlertViewDelegateProxy.self, self) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_clickedButtonAtIndex: ControlEvent { - let source = rx_delegate.observe("alertView:clickedButtonAtIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_willDismissWithButtonIndex: ControlEvent { - let source = rx_delegate.observe("alertView:willDismissWithButtonIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } - - /** - Reactive wrapper for `delegate` message. - */ - @available(*, deprecated=2.0.0, message="This class is deprecated by Apple. Removing official support.") - public var rx_didDismissWithButtonIndex: ControlEvent { - let source = rx_delegate.observe("alertView:didDismissWithButtonIndex:") - .map { a in - return a[1] as! Int - } - - return ControlEvent(events: source) - } -} - -#endif diff --git a/RxCocoa/iOS/UICollectionView+Rx.swift b/RxCocoa/iOS/UICollectionView+Rx.swift index 9a8d214d..6786d47d 100644 --- a/RxCocoa/iOS/UICollectionView+Rx.swift +++ b/RxCocoa/iOS/UICollectionView+Rx.swift @@ -166,11 +166,6 @@ extension UICollectionView { return ControlEvent(events: source) } - - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_modelSelected() -> ControlEvent { - return rx_modelSelected(T.self) - } /** Syncronous helper method for retrieving a model at indexPath through a reactive data source diff --git a/RxCocoa/iOS/UIControl+Rx.swift b/RxCocoa/iOS/UIControl+Rx.swift index 9f79d12a..3e7f356f 100644 --- a/RxCocoa/iOS/UIControl+Rx.swift +++ b/RxCocoa/iOS/UIControl+Rx.swift @@ -62,11 +62,6 @@ extension UIControl { return ControlEvent(events: source) } - @available(*, deprecated=2.0.0, message="Please use rx_controlEvent.") - public func rx_controlEvents(controlEvents: UIControlEvents) -> ControlEvent { - return rx_controlEvent(controlEvents) - } - func rx_value(getter getter: () -> T, setter: T -> Void) -> ControlProperty { let source: Observable = Observable.create { [weak self] observer in guard let control = self else { diff --git a/RxCocoa/iOS/UITableView+Rx.swift b/RxCocoa/iOS/UITableView+Rx.swift index 77303036..66134491 100644 --- a/RxCocoa/iOS/UITableView+Rx.swift +++ b/RxCocoa/iOS/UITableView+Rx.swift @@ -212,11 +212,6 @@ extension UITableView { } - @available(*, deprecated=2.0.0, message="Please use version that takes type as first argument.") - public func rx_modelSelected() -> ControlEvent { - return rx_modelSelected(T.self) - } - /** Synchronous helper method for retrieving a model at indexPath through a reactive data source */ diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj index 914bc048..822e16dd 100644 --- a/RxExample/RxExample.xcodeproj/project.pbxproj +++ b/RxExample/RxExample.xcodeproj/project.pbxproj @@ -213,7 +213,6 @@ C89464AC1BC6C2B00055219D /* NAryDisposable.tt in Resources */ = {isa = PBXBuildFile; fileRef = C89464391BC6C2B00055219D /* NAryDisposable.tt */; }; C89464AD1BC6C2B00055219D /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643A1BC6C2B00055219D /* NopDisposable.swift */; }; C89464AE1BC6C2B00055219D /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643B1BC6C2B00055219D /* ScheduledDisposable.swift */; }; - C89464AF1BC6C2B00055219D /* ScopedDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643C1BC6C2B00055219D /* ScopedDisposable.swift */; }; C89464B01BC6C2B00055219D /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643D1BC6C2B00055219D /* SerialDisposable.swift */; }; C89464B11BC6C2B00055219D /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643E1BC6C2B00055219D /* SingleAssignmentDisposable.swift */; }; C89464B21BC6C2B00055219D /* StableCompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894643F1BC6C2B00055219D /* StableCompositeDisposable.swift */; }; @@ -285,7 +284,6 @@ C89464F61BC6C2B00055219D /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464861BC6C2B00055219D /* AnonymousObserver.swift */; }; C89464F71BC6C2B00055219D /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464871BC6C2B00055219D /* ObserverBase.swift */; }; C89464F81BC6C2B00055219D /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464881BC6C2B00055219D /* TailRecursiveSink.swift */; }; - C89464F91BC6C2B00055219D /* ObserverType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464891BC6C2B00055219D /* ObserverType+Extensions.swift */; }; C89464FA1BC6C2B00055219D /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894648A1BC6C2B00055219D /* ObserverType.swift */; }; C89464FB1BC6C2B00055219D /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894648B1BC6C2B00055219D /* Rx.swift */; }; C89464FC1BC6C2B00055219D /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894648C1BC6C2B00055219D /* RxMutableBox.swift */; }; @@ -309,7 +307,6 @@ C89465751BC6C2BC0055219D /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465291BC6C2BC0055219D /* KVOObservable.swift */; }; C89465761BC6C2BC0055219D /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894652A1BC6C2BC0055219D /* KVOObserver.swift */; }; C89465771BC6C2BC0055219D /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894652B1BC6C2BC0055219D /* NSNotificationCenter+Rx.swift */; }; - C89465781BC6C2BC0055219D /* NSObject+Rx+CoreGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894652C1BC6C2BC0055219D /* NSObject+Rx+CoreGraphics.swift */; }; C89465791BC6C2BC0055219D /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894652D1BC6C2BC0055219D /* NSObject+Rx.swift */; }; C894657A1BC6C2BC0055219D /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894652E1BC6C2BC0055219D /* NSURLSession+Rx.swift */; }; C894657B1BC6C2BC0055219D /* RxCLLocationManagerDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465301BC6C2BC0055219D /* RxCLLocationManagerDelegateProxy.swift */; }; @@ -321,8 +318,6 @@ C89465811BC6C2BC0055219D /* ItemEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465391BC6C2BC0055219D /* ItemEvents.swift */; }; C89465821BC6C2BC0055219D /* RxCollectionViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894653B1BC6C2BC0055219D /* RxCollectionViewDataSourceType.swift */; }; C89465831BC6C2BC0055219D /* RxTableViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894653C1BC6C2BC0055219D /* RxTableViewDataSourceType.swift */; }; - C89465841BC6C2BC0055219D /* RxActionSheetDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894653E1BC6C2BC0055219D /* RxActionSheetDelegateProxy.swift */; }; - C89465851BC6C2BC0055219D /* RxAlertViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894653F1BC6C2BC0055219D /* RxAlertViewDelegateProxy.swift */; }; C89465861BC6C2BC0055219D /* RxCollectionViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465401BC6C2BC0055219D /* RxCollectionViewDataSourceProxy.swift */; }; C89465871BC6C2BC0055219D /* RxCollectionViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465411BC6C2BC0055219D /* RxCollectionViewDelegateProxy.swift */; }; C89465881BC6C2BC0055219D /* RxScrollViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465421BC6C2BC0055219D /* RxScrollViewDelegateProxy.swift */; }; @@ -330,8 +325,6 @@ C894658A1BC6C2BC0055219D /* RxTableViewDataSourceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465441BC6C2BC0055219D /* RxTableViewDataSourceProxy.swift */; }; C894658B1BC6C2BC0055219D /* RxTableViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465451BC6C2BC0055219D /* RxTableViewDelegateProxy.swift */; }; C894658C1BC6C2BC0055219D /* RxTextViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465461BC6C2BC0055219D /* RxTextViewDelegateProxy.swift */; }; - C894658D1BC6C2BC0055219D /* UIActionSheet+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465471BC6C2BC0055219D /* UIActionSheet+Rx.swift */; }; - C894658E1BC6C2BC0055219D /* UIAlertView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465481BC6C2BC0055219D /* UIAlertView+Rx.swift */; }; C894658F1BC6C2BC0055219D /* UIBarButtonItem+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89465491BC6C2BC0055219D /* UIBarButtonItem+Rx.swift */; }; C89465901BC6C2BC0055219D /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894654A1BC6C2BC0055219D /* UIButton+Rx.swift */; }; C89465911BC6C2BC0055219D /* UICollectionView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894654B1BC6C2BC0055219D /* UICollectionView+Rx.swift */; }; @@ -399,7 +392,6 @@ C8F6A12B1BEF9DA3007DF367 /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894648E1BC6C2B00055219D /* ConcurrentDispatchQueueScheduler.swift */; }; C8F6A12C1BEF9DA3007DF367 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8B145051BD2E45200267DCE /* ConcurrentMainScheduler.swift */; }; C8F6A12D1BEF9DA3007DF367 /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C894648F1BC6C2B00055219D /* CurrentThreadScheduler.swift */; }; - C8F6A12E1BEF9DA3007DF367 /* DispatchQueueSchedulerPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464901BC6C2B00055219D /* DispatchQueueSchedulerPriority.swift */; }; C8F6A12F1BEF9DA3007DF367 /* ImmediateScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8B145041BD2E45200267DCE /* ImmediateScheduler.swift */; }; C8F6A1301BEF9DA3007DF367 /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464911BC6C2B00055219D /* MainScheduler.swift */; }; C8F6A1311BEF9DA3007DF367 /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89464921BC6C2B00055219D /* OperationQueueScheduler.swift */; }; @@ -698,7 +690,6 @@ C89464391BC6C2B00055219D /* NAryDisposable.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NAryDisposable.tt; sourceTree = ""; }; C894643A1BC6C2B00055219D /* NopDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NopDisposable.swift; sourceTree = ""; }; C894643B1BC6C2B00055219D /* ScheduledDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledDisposable.swift; sourceTree = ""; }; - C894643C1BC6C2B00055219D /* ScopedDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScopedDisposable.swift; sourceTree = ""; }; C894643D1BC6C2B00055219D /* SerialDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerialDisposable.swift; sourceTree = ""; }; C894643E1BC6C2B00055219D /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleAssignmentDisposable.swift; sourceTree = ""; }; C894643F1BC6C2B00055219D /* StableCompositeDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StableCompositeDisposable.swift; sourceTree = ""; }; @@ -770,13 +761,11 @@ C89464861BC6C2B00055219D /* AnonymousObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnonymousObserver.swift; sourceTree = ""; }; C89464871BC6C2B00055219D /* ObserverBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserverBase.swift; sourceTree = ""; }; C89464881BC6C2B00055219D /* TailRecursiveSink.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TailRecursiveSink.swift; sourceTree = ""; }; - C89464891BC6C2B00055219D /* ObserverType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObserverType+Extensions.swift"; sourceTree = ""; }; C894648A1BC6C2B00055219D /* ObserverType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserverType.swift; sourceTree = ""; }; C894648B1BC6C2B00055219D /* Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Rx.swift; sourceTree = ""; }; C894648C1BC6C2B00055219D /* RxMutableBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxMutableBox.swift; sourceTree = ""; }; C894648E1BC6C2B00055219D /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrentDispatchQueueScheduler.swift; sourceTree = ""; }; C894648F1BC6C2B00055219D /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrentThreadScheduler.swift; sourceTree = ""; }; - C89464901BC6C2B00055219D /* DispatchQueueSchedulerPriority.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DispatchQueueSchedulerPriority.swift; sourceTree = ""; }; C89464911BC6C2B00055219D /* MainScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainScheduler.swift; sourceTree = ""; }; C89464921BC6C2B00055219D /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperationQueueScheduler.swift; sourceTree = ""; }; C89464931BC6C2B00055219D /* RecursiveScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecursiveScheduler.swift; sourceTree = ""; }; @@ -805,7 +794,6 @@ C89465291BC6C2BC0055219D /* KVOObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObservable.swift; sourceTree = ""; }; C894652A1BC6C2BC0055219D /* KVOObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObserver.swift; sourceTree = ""; }; C894652B1BC6C2BC0055219D /* NSNotificationCenter+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSNotificationCenter+Rx.swift"; sourceTree = ""; }; - C894652C1BC6C2BC0055219D /* NSObject+Rx+CoreGraphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx+CoreGraphics.swift"; sourceTree = ""; }; C894652D1BC6C2BC0055219D /* NSObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = ""; }; C894652E1BC6C2BC0055219D /* NSURLSession+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Rx.swift"; sourceTree = ""; }; C89465301BC6C2BC0055219D /* RxCLLocationManagerDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCLLocationManagerDelegateProxy.swift; sourceTree = ""; }; @@ -817,8 +805,6 @@ C89465391BC6C2BC0055219D /* ItemEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemEvents.swift; sourceTree = ""; }; C894653B1BC6C2BC0055219D /* RxCollectionViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDataSourceType.swift; sourceTree = ""; }; C894653C1BC6C2BC0055219D /* RxTableViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDataSourceType.swift; sourceTree = ""; }; - C894653E1BC6C2BC0055219D /* RxActionSheetDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxActionSheetDelegateProxy.swift; sourceTree = ""; }; - C894653F1BC6C2BC0055219D /* RxAlertViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAlertViewDelegateProxy.swift; sourceTree = ""; }; C89465401BC6C2BC0055219D /* RxCollectionViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDataSourceProxy.swift; sourceTree = ""; }; C89465411BC6C2BC0055219D /* RxCollectionViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewDelegateProxy.swift; sourceTree = ""; }; C89465421BC6C2BC0055219D /* RxScrollViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxScrollViewDelegateProxy.swift; sourceTree = ""; }; @@ -826,8 +812,6 @@ C89465441BC6C2BC0055219D /* RxTableViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDataSourceProxy.swift; sourceTree = ""; }; C89465451BC6C2BC0055219D /* RxTableViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewDelegateProxy.swift; sourceTree = ""; }; C89465461BC6C2BC0055219D /* RxTextViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextViewDelegateProxy.swift; sourceTree = ""; }; - C89465471BC6C2BC0055219D /* UIActionSheet+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIActionSheet+Rx.swift"; sourceTree = ""; }; - C89465481BC6C2BC0055219D /* UIAlertView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIAlertView+Rx.swift"; sourceTree = ""; }; C89465491BC6C2BC0055219D /* UIBarButtonItem+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "UIBarButtonItem+Rx.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; C894654A1BC6C2BC0055219D /* UIButton+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Rx.swift"; sourceTree = ""; }; C894654B1BC6C2BC0055219D /* UICollectionView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Rx.swift"; sourceTree = ""; }; @@ -1295,7 +1279,6 @@ C89464831BC6C2B00055219D /* ObservableType.swift */, C89464841BC6C2B00055219D /* AnyObserver.swift */, C89464851BC6C2B00055219D /* Observers */, - C89464891BC6C2B00055219D /* ObserverType+Extensions.swift */, C894648A1BC6C2B00055219D /* ObserverType.swift */, C894648B1BC6C2B00055219D /* Rx.swift */, C894648C1BC6C2B00055219D /* RxMutableBox.swift */, @@ -1347,7 +1330,6 @@ C894643A1BC6C2B00055219D /* NopDisposable.swift */, CB883B4F1BE3AC54000AC2EE /* RefCountDisposable.swift */, C894643B1BC6C2B00055219D /* ScheduledDisposable.swift */, - C894643C1BC6C2B00055219D /* ScopedDisposable.swift */, C894643D1BC6C2B00055219D /* SerialDisposable.swift */, C894643E1BC6C2B00055219D /* SingleAssignmentDisposable.swift */, C894643F1BC6C2B00055219D /* StableCompositeDisposable.swift */, @@ -1463,7 +1445,6 @@ C894648E1BC6C2B00055219D /* ConcurrentDispatchQueueScheduler.swift */, C8B145051BD2E45200267DCE /* ConcurrentMainScheduler.swift */, C894648F1BC6C2B00055219D /* CurrentThreadScheduler.swift */, - C89464901BC6C2B00055219D /* DispatchQueueSchedulerPriority.swift */, C8B145041BD2E45200267DCE /* ImmediateScheduler.swift */, C89464911BC6C2B00055219D /* MainScheduler.swift */, C89464921BC6C2B00055219D /* OperationQueueScheduler.swift */, @@ -1544,7 +1525,6 @@ C83974221BF77413004F02CC /* NSObject+Rx+RawRepresentable.swift */, C89465251BC6C2BC0055219D /* Implementations */, C894652B1BC6C2BC0055219D /* NSNotificationCenter+Rx.swift */, - C894652C1BC6C2BC0055219D /* NSObject+Rx+CoreGraphics.swift */, C894652D1BC6C2BC0055219D /* NSObject+Rx.swift */, C894652E1BC6C2BC0055219D /* NSURLSession+Rx.swift */, ); @@ -1579,8 +1559,6 @@ C894653A1BC6C2BC0055219D /* Protocols */, C894653D1BC6C2BC0055219D /* Proxies */, C8BCD4031C14BFCA005F1280 /* UIView+Rx.swift */, - C89465471BC6C2BC0055219D /* UIActionSheet+Rx.swift */, - C89465481BC6C2BC0055219D /* UIAlertView+Rx.swift */, C89465491BC6C2BC0055219D /* UIBarButtonItem+Rx.swift */, C894654A1BC6C2BC0055219D /* UIButton+Rx.swift */, C894654B1BC6C2BC0055219D /* UICollectionView+Rx.swift */, @@ -1632,8 +1610,6 @@ C894653D1BC6C2BC0055219D /* Proxies */ = { isa = PBXGroup; children = ( - C894653E1BC6C2BC0055219D /* RxActionSheetDelegateProxy.swift */, - C894653F1BC6C2BC0055219D /* RxAlertViewDelegateProxy.swift */, C89465401BC6C2BC0055219D /* RxCollectionViewDataSourceProxy.swift */, C89465411BC6C2BC0055219D /* RxCollectionViewDelegateProxy.swift */, C89465421BC6C2BC0055219D /* RxScrollViewDelegateProxy.swift */, @@ -2032,7 +2008,6 @@ C8BCD3E71C14A95E005F1280 /* NumbersViewController.swift in Sources */, C89464A51BC6C2B00055219D /* Disposable.swift in Sources */, C843A0911C1CE39900CBA4BD /* GitHubSearchRepositoriesViewController.swift in Sources */, - C89464F91BC6C2B00055219D /* ObserverType+Extensions.swift in Sources */, C84CC58D1BDD486300E06A64 /* SynchronizedOnType.swift in Sources */, C83974121BF77406004F02CC /* KVORepresentable.swift in Sources */, C89464DC1BC6C2B00055219D /* Scan.swift in Sources */, @@ -2041,7 +2016,6 @@ C89464B51BC6C2B00055219D /* ImmediateSchedulerType.swift in Sources */, C8297E321B6CF905000589EA /* HtmlParsing.swift in Sources */, C8297E331B6CF905000589EA /* NumberCell.swift in Sources */, - C894658D1BC6C2BC0055219D /* UIActionSheet+Rx.swift in Sources */, C89464EA1BC6C2B00055219D /* Zip.swift in Sources */, C89464E51BC6C2B00055219D /* Throttle.swift in Sources */, C83974241BF77413004F02CC /* NSObject+Rx+RawRepresentable.swift in Sources */, @@ -2088,7 +2062,6 @@ C894649E1BC6C2B00055219D /* Cancelable.swift in Sources */, C89464E01BC6C2B00055219D /* SubscribeOn.swift in Sources */, C89465801BC6C2BC0055219D /* RxTableViewReactiveArrayDataSource.swift in Sources */, - C89464AF1BC6C2B00055219D /* ScopedDisposable.swift in Sources */, C89464FA1BC6C2B00055219D /* ObserverType.swift in Sources */, C89464F01BC6C2B00055219D /* Observable+Multiple.swift in Sources */, C891A2C91C07160C00DDD09D /* Timeout.swift in Sources */, @@ -2117,7 +2090,6 @@ C89464CC1BC6C2B00055219D /* Filter.swift in Sources */, C864BAE01C3332F10083833C /* UIImageView+Extensions.swift in Sources */, C80DDED31BCE9046006A1832 /* ControlProperty+Driver.swift in Sources */, - C8F6A12E1BEF9DA3007DF367 /* DispatchQueueSchedulerPriority.swift in Sources */, C89464C11BC6C2B00055219D /* CombineLatest+CollectionType.swift in Sources */, C89465671BC6C2BC0055219D /* ControlEvent.swift in Sources */, C89464A61BC6C2B00055219D /* AnonymousDisposable.swift in Sources */, @@ -2172,7 +2144,6 @@ C89465611BC6C2BC0055219D /* _RX.m in Sources */, CB30D9EE1BF106260084C1C0 /* SingleAsync.swift in Sources */, C80DDED41BCE9046006A1832 /* Driver+Operators+arity.swift in Sources */, - C89465841BC6C2BC0055219D /* RxActionSheetDelegateProxy.swift in Sources */, C89464F51BC6C2B00055219D /* AnyObserver.swift in Sources */, C89464D71BC6C2B00055219D /* Range.swift in Sources */, C84CC52E1BDC344100E06A64 /* ElementAt.swift in Sources */, @@ -2184,7 +2155,6 @@ C822B1DD1C14CD1C0088A01A /* DefaultImplementations.swift in Sources */, C89464D51BC6C2B00055219D /* ObserveOnSerialDispatchQueue.swift in Sources */, C843A08F1C1CE39900CBA4BD /* GitHubSearchRepositoriesAPI.swift in Sources */, - C894658E1BC6C2BC0055219D /* UIAlertView+Rx.swift in Sources */, C83974231BF77413004F02CC /* NSObject+Rx+KVORepresentable.swift in Sources */, C8297E461B6CF905000589EA /* Example.swift in Sources */, C89465081BC6C2B00055219D /* PublishSubject.swift in Sources */, @@ -2249,7 +2219,6 @@ C8297E521B6CF905000589EA /* Dependencies.swift in Sources */, C80DDED91BCE9046006A1832 /* ObservableConvertibleType+Driver.swift in Sources */, C89464E11BC6C2B00055219D /* Switch.swift in Sources */, - C89465851BC6C2BC0055219D /* RxAlertViewDelegateProxy.swift in Sources */, C89464A11BC6C2B00055219D /* ConnectableObservableType.swift in Sources */, C864BAD81C3332F10083833C /* DetailViewController.swift in Sources */, C89464C41BC6C2B00055219D /* ConnectableObservable.swift in Sources */, @@ -2257,7 +2226,6 @@ C8297E531B6CF905000589EA /* WikipediaAPI.swift in Sources */, C89465071BC6C2B00055219D /* BehaviorSubject.swift in Sources */, C89465911BC6C2BC0055219D /* UICollectionView+Rx.swift in Sources */, - C89465781BC6C2BC0055219D /* NSObject+Rx+CoreGraphics.swift in Sources */, C89464D01BC6C2B00055219D /* Map.swift in Sources */, C8297E541B6CF905000589EA /* AppDelegate.swift in Sources */, C894659D1BC6C2BC0055219D /* UITableView+Rx.swift in Sources */, diff --git a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift index 48463929..b7a18c60 100644 --- a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift +++ b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift @@ -60,70 +60,6 @@ class APIWrappersViewController: ViewController { datePicker.date = NSDate(timeIntervalSince1970: 0) - let ash = UIActionSheet(title: "Title", delegate: nil, cancelButtonTitle: "Cancel", destructiveButtonTitle: "OK") - let av = UIAlertView(title: "Title", message: "The message", delegate: nil, cancelButtonTitle: "Cancel", otherButtonTitles: "OK", "Two", "Three", "Four", "Five") - - openActionSheet.rx_tap - .subscribeNext { [weak self] x in - if let view = self?.view { - ash.showInView(view) - } - } - .addDisposableTo(disposeBag) - - openAlertView.rx_tap - .subscribeNext { x in - av.show() - } - .addDisposableTo(disposeBag) - - // MARK: UIActionSheet - - ash.rx_clickedButtonAtIndex - .subscribeNext { [weak self] x in - self?.debug("UIActionSheet clickedButtonAtIndex \(x)") - } - .addDisposableTo(disposeBag) - - ash.rx_willDismissWithButtonIndex - .subscribeNext { [weak self] x in - self?.debug("UIActionSheet willDismissWithButtonIndex \(x)") - } - .addDisposableTo(disposeBag) - - ash.rx_didDismissWithButtonIndex - .subscribeNext { [weak self] x in - self?.debug("UIActionSheet didDismissWithButtonIndex \(x)") - } - .addDisposableTo(disposeBag) - - - // MARK: UIAlertView - - av.rx_clickedButtonAtIndex - .subscribeNext { [weak self] x in - self?.debug("UIAlertView clickedButtonAtIndex \(x)") - } - .addDisposableTo(disposeBag) - - av.rx_willDismissWithButtonIndex - .subscribeNext { [weak self] x in - self?.debug("UIAlertView willDismissWithButtonIndex \(x)") - } - .addDisposableTo(disposeBag) - - av.rx_didDismissWithButtonIndex - .subscribeNext { [weak self] x in - self?.debug("UIAlertView didDismissWithButtonIndex \(x)") - } - .addDisposableTo(disposeBag) - - - - - - - // MARK: UIBarButtonItem bbitem.rx_tap diff --git a/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift b/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift index 660fa74b..006020ec 100644 --- a/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift +++ b/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift @@ -27,8 +27,6 @@ class GitHubSearchRepositoriesViewController: ViewController, UITableViewDelegat override func viewDidLoad() { super.viewDidLoad() - let $: Dependencies = Dependencies.sharedDependencies - let tableView = self.tableView let searchBar = self.searchBar diff --git a/RxExample/RxExample/Examples/PartialUpdates/PartialUpdatesViewController.swift b/RxExample/RxExample/Examples/PartialUpdates/PartialUpdatesViewController.swift index 527ebc8a..54832918 100644 --- a/RxExample/RxExample/Examples/PartialUpdates/PartialUpdatesViewController.swift +++ b/RxExample/RxExample/Examples/PartialUpdates/PartialUpdatesViewController.swift @@ -78,11 +78,11 @@ class PartialUpdatesViewController : ViewController { skinTableViewDataSource(tvAnimatedDataSource) skinTableViewDataSource(reloadDataSource) - self.sections + self.sections.asObservable() .bindTo(partialUpdatesTableViewOutlet.rx_itemsAnimatedWithDataSource(tvAnimatedDataSource)) .addDisposableTo(disposeBag) - self.sections + self.sections.asObservable() .bindTo(reloadTableViewOutlet.rx_itemsWithDataSource(reloadDataSource)) .addDisposableTo(disposeBag) @@ -108,7 +108,7 @@ class PartialUpdatesViewController : ViewController { #else let cvReloadDataSource = RxCollectionViewSectionedReloadDataSource() skinCollectionViewDataSource(cvReloadDataSource) - self.sections + self.sections.asObservable() .bindTo(partialUpdatesCollectionViewOutlet.rx_itemsWithDataSource(cvReloadDataSource)) .addDisposableTo(disposeBag) #endif diff --git a/RxExample/RxExample/Services/Wireframe.swift b/RxExample/RxExample/Services/Wireframe.swift index 12ee2d61..387b0668 100644 --- a/RxExample/RxExample/Services/Wireframe.swift +++ b/RxExample/RxExample/Services/Wireframe.swift @@ -39,51 +39,40 @@ class DefaultWireframe: Wireframe { #endif } + #if os(iOS) + private static func rootViewController() -> UIViewController { + // cheating, I know + return UIApplication.sharedApplication().keyWindow!.rootViewController! + } + #endif + static func presentAlert(message: String) { #if os(iOS) - let alertView = UIAlertView( - title: "RxExample", - message: message, - delegate: nil, - cancelButtonTitle: "OK" - ) - - alertView.show() + let alertView = UIAlertController(title: "RxExample", message: message, preferredStyle: .Alert) + alertView.addAction(UIAlertAction(title: "OK", style: .Cancel) { _ in + }) + rootViewController().presentViewController(alertView, animated: true, completion: nil) #endif } func promptFor(message: String, cancelAction: Action, actions: [Action]) -> Observable { #if os(iOS) return Observable.create { observer in - let alertView = UIAlertView( - title: "RxExample", - message: message, - delegate: nil, - cancelButtonTitle: cancelAction.description - ) + let alertView = UIAlertController(title: "RxExample", message: message, preferredStyle: .Alert) + alertView.addAction(UIAlertAction(title: cancelAction.description, style: .Cancel) { _ in + observer.on(.Next(cancelAction)) + }) for action in actions { - alertView.addButtonWithTitle(action.description) + alertView.addAction(UIAlertAction(title: action.description, style: .Default) { _ in + observer.on(.Next(action)) + }) } - alertView.show() - - observer.on(.Next(alertView)) + DefaultWireframe.rootViewController().presentViewController(alertView, animated: true, completion: nil) return AnonymousDisposable { - alertView.dismissWithClickedButtonIndex(-1, animated: true) - } - }.flatMap { (alertView: UIAlertView) -> Observable in - return alertView.rx_didDismissWithButtonIndex.flatMap { index -> Observable in - if index < 0 { - return Observable.empty() - } - - if index == 0 { - return Observable.just(cancelAction) - } - - return Observable.just(actions[index - 1]) + alertView.dismissViewControllerAnimated(false, completion: nil) } } #elseif os(OSX) diff --git a/RxSwift/Disposables/ScopedDisposable.swift b/RxSwift/Disposables/ScopedDisposable.swift deleted file mode 100644 index 22afc90f..00000000 --- a/RxSwift/Disposables/ScopedDisposable.swift +++ /dev/null @@ -1,59 +0,0 @@ -// -// ScopedDisposable.swift -// RxSwift -// -// Created by Krunoslav Zaher on 5/2/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -import Foundation - -extension Disposable { - /** - Returns `ScopedDispose` that will dispose `self` when execution exits current block. - - **If the reference to returned instance isn't named, it will be deallocated - immediately and subscription will be immediately disposed.** - - Example usage: - - let disposeOnExit = disposable.scopedDispose() - - - returns: `ScopedDisposable` that will dispose `self` on `deinit`. - */ - @available(*, deprecated=2.0.0, message="Please use `DisposeBag` and `addDisposableTo`") - public func scopedDispose() -> ScopedDisposable { - return ScopedDisposable(disposable: self) - } -} - - -/** -`ScopedDisposable` will dispose `disposable` on `deinit`. - -This returns ARC (RAII) like resource management to `RxSwift`. -*/ -@available(*, deprecated=2.0.0, message="Please use `DisposeBag` and `addDisposableTo`") -public class ScopedDisposable : DisposeBase { - private var _disposable: Disposable? - - /** - Initializes new instance with a single disposable. - - - parameter disposable: `Disposable` that will be disposed on scope exit. - */ - public init(disposable: Disposable) { - _disposable = disposable - } - - /** - This is intentionally private. - */ - func dispose() { - _disposable?.dispose() - } - - deinit { - dispose() - } -} \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/CombineLatest+arity.swift b/RxSwift/Observables/Implementations/CombineLatest+arity.swift index b8205a65..8f7b608c 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+arity.swift +++ b/RxSwift/Observables/Implementations/CombineLatest+arity.swift @@ -13,16 +13,6 @@ import Foundation // 2 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, resultSelector: (O1.E, O2.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -104,16 +94,6 @@ class CombineLatest2 : Producer { // 3 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, resultSelector: (O1.E, O2.E, O3.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -202,16 +182,6 @@ class CombineLatest3 : Producer { // 4 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: (O1.E, O2.E, O3.E, O4.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, source4, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -307,16 +277,6 @@ class CombineLatest4 : Producer { // 5 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, source4, source5, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -419,16 +379,6 @@ class CombineLatest5 : Producer { // 6 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, source4, source5, source6, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -538,16 +488,6 @@ class CombineLatest6 : Producer { // 7 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, source4, source5, source6, source7, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. @@ -664,16 +604,6 @@ class CombineLatest7 : Producer { // 8 -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest - (source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> R) - -> Observable { - return Observable.combineLatest( - source1, source2, source3, source4, source5, source6, source7, source8, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. diff --git a/RxSwift/Observables/Implementations/CombineLatest+arity.tt b/RxSwift/Observables/Implementations/CombineLatest+arity.tt index 300490aa..ef8b3a83 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+arity.tt +++ b/RxSwift/Observables/Implementations/CombineLatest+arity.tt @@ -12,16 +12,6 @@ import Foundation // <%= i %> -@available(*, deprecated=2.0.0, message="Please use `Observable.combineLatest`") -public func combineLatest<<%= (Array(1...i).map { "O\($0): ObservableType" }).joinWithSeparator(", ") %>, R> - (<%= (Array(1...i).map { "source\($0): O\($0)" }).joinWithSeparator(", _ ") %>, resultSelector: (<%= (Array(1...i).map { "O\($0).E" }).joinWithSeparator(", ") %>) throws -> R) - -> Observable { - return Observable.combineLatest( - <%= (Array(1...i).map { "source\($0)" }).joinWithSeparator(", ") %>, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element. diff --git a/RxSwift/Observables/Implementations/Zip+arity.swift b/RxSwift/Observables/Implementations/Zip+arity.swift index 28291fe9..36679bf5 100644 --- a/RxSwift/Observables/Implementations/Zip+arity.swift +++ b/RxSwift/Observables/Implementations/Zip+arity.swift @@ -13,16 +13,6 @@ import Foundation // 2 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, resultSelector: (O1.E, O2.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -116,16 +106,6 @@ class Zip2 : Producer { // 3 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, resultSelector: (O1.E, O2.E, O3.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -227,16 +207,6 @@ class Zip3 : Producer { // 4 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: (O1.E, O2.E, O3.E, O4.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, source4, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -346,16 +316,6 @@ class Zip4 : Producer { // 5 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, source4, source5, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -473,16 +433,6 @@ class Zip5 : Producer { // 6 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, source4, source5, source6, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -608,16 +558,6 @@ class Zip6 : Producer { // 7 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, source4, source5, source6, source7, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. @@ -751,16 +691,6 @@ class Zip7 : Producer { // 8 -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip -(source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> R) - -> Observable { - return Observable.zip( - source1, source2, source3, source4, source5, source6, source7, source8, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. diff --git a/RxSwift/Observables/Implementations/Zip+arity.tt b/RxSwift/Observables/Implementations/Zip+arity.tt index 0f58b7ed..d2e80acb 100644 --- a/RxSwift/Observables/Implementations/Zip+arity.tt +++ b/RxSwift/Observables/Implementations/Zip+arity.tt @@ -12,16 +12,6 @@ import Foundation // <%= i %> -@available(*, deprecated=2.0.0, message="Please use `Observable.zip`") -public func zip<<%= (Array(1...i).map { "O\($0): ObservableType" }).joinWithSeparator(", ") %>, R> -(<%= (Array(1...i).map { "source\($0): O\($0)" }).joinWithSeparator(", _ ") %>, resultSelector: (<%= (Array(1...i).map { "O\($0).E" }).joinWithSeparator(", ") %>) throws -> R) - -> Observable { - return Observable.zip( - <%= (Array(1...i).map { "source\($0)" }).joinWithSeparator(", ") %>, - resultSelector: resultSelector - ) -} - extension Observable { /** Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index. diff --git a/RxSwift/Observables/Observable+Aggregate.swift b/RxSwift/Observables/Observable+Aggregate.swift index a8449f48..0acdce67 100644 --- a/RxSwift/Observables/Observable+Aggregate.swift +++ b/RxSwift/Observables/Observable+Aggregate.swift @@ -30,12 +30,6 @@ extension ObservableType { return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: mapResult) } - @available(*, deprecated=2.0.0, message="Please use version with named accumulator parameter.") - public func reduce(seed: A, _ accumulator: (A, E) throws -> A, mapResult: (A) throws -> R) - -> Observable { - return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: mapResult) - } - /** Applies an `accumulator` function over an observable sequence, returning the result of the aggregation as a single element in the result sequence. The specified `seed` value is used as the initial accumulator value. diff --git a/RxSwift/Observables/Observable+Creation.swift b/RxSwift/Observables/Observable+Creation.swift index 3012d310..ff57d38b 100644 --- a/RxSwift/Observables/Observable+Creation.swift +++ b/RxSwift/Observables/Observable+Creation.swift @@ -8,66 +8,6 @@ import Foundation -@available(*, deprecated=2.0.0, message="Please use `Observable.create`") -public func create(subscribe: (AnyObserver) -> Disposable) -> Observable { - return Observable.create(subscribe) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.empty`") -public func empty(type: E.Type = E.self) -> Observable { - return Observable.empty() -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.never`") -public func never(type: E.Type = E.self) -> Observable { - return Observable.never() -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.just`") -public func just(element: E) -> Observable { - return Observable.just(element) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.just`") -public func just(element: E, scheduler: ImmediateSchedulerType) -> Observable { - return Observable.just(element, scheduler: scheduler) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.error`") -public func failWith(error: ErrorType, _ type: E.Type = E.self) -> Observable { - return Observable.error(error) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.of`") -public func sequenceOf(elements: E ..., scheduler: ImmediateSchedulerType? = nil) -> Observable { - return Sequence(elements: elements, scheduler: scheduler) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.deferred`") -public func deferred(observableFactory: () throws -> Observable) -> Observable { - return Observable.deferred(observableFactory) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.generate` with named initialState parameter.") -public func generate(initialState: E, condition: E throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: E throws -> E) -> Observable { - return Observable.generate(initialState: initialState, condition: condition, scheduler: scheduler, iterate: iterate) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.range` with named start, count, scheduler parameters.") -public func range(start: Int, _ count: Int, _ scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable { - return Observable.range(start: start, count: count, scheduler: scheduler) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.repeatElement` with named scheduler parameter.") -public func repeatElement(element: E, _ scheduler: ImmediateSchedulerType) -> Observable { - return Observable.repeatElement(element, scheduler: scheduler) -} - -@available(*, deprecated=2.0.0, message="Please use `Observable.using`.") -public func using(resourceFactory: () throws -> R, observableFactory: R throws -> Observable) -> Observable { - return Observable.using(resourceFactory, observableFactory: observableFactory) -} - extension Observable { // MARK: create @@ -256,19 +196,6 @@ extension SequenceType { - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html) - - returns: The observable sequence whose elements are pulled from the given enumerable sequence. - */ - @warn_unused_result(message="http://git.io/rxs.uo") - @available(*, deprecated=2.0.0, message="Please use toObservable extension.") - public func asObservable() -> Observable { - return Sequence(elements: Array(self), scheduler: nil) - } - - /** - Converts a sequence to an observable sequence. - - - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html) - - returns: The observable sequence whose elements are pulled from the given enumerable sequence. */ @warn_unused_result(message="http://git.io/rxs.uo") diff --git a/RxSwift/Observables/Observable+Time.swift b/RxSwift/Observables/Observable+Time.swift index 8d859f23..31c95cd4 100644 --- a/RxSwift/Observables/Observable+Time.swift +++ b/RxSwift/Observables/Observable+Time.swift @@ -28,13 +28,6 @@ extension ObservableType { return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) } - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func throttle(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) - } - - /** Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers. @@ -51,12 +44,6 @@ extension ObservableType { -> Observable { return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) } - - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func debounce(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) - } } // MARK: sample @@ -80,23 +67,6 @@ extension ObservableType { -> Observable { return Sample(source: self.asObservable(), sampler: sampler.asObservable(), onlyNew: true) } - - @available(*, deprecated=2.0.0, message="Please use `withLatestFrom`.") - public func sampleLatest(sampler: O) - -> Observable { - return Sample(source: self.asObservable(), sampler: sampler.asObservable(), onlyNew: false) - } -} - -// MARK: interval - -@available(*, deprecated=2.0.0, message="Please use version `Observable.interval`.") -public func interval(period: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Timer(dueTime: period, - period: period, - scheduler: scheduler - ) } extension Observable where Element : SignedIntegerType { @@ -121,16 +91,6 @@ extension Observable where Element : SignedIntegerType { // MARK: timer -@available(*, deprecated=2.0.0, message="Please use version `Observable.timer`.") -public func timer(dueTime: RxTimeInterval, _ period: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Timer( - dueTime: dueTime, - period: period, - scheduler: scheduler - ) -} - extension Observable where Element: SignedIntegerType { /** Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers. @@ -153,16 +113,6 @@ extension Observable where Element: SignedIntegerType { } } -@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") -public func timer(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Timer( - dueTime: dueTime, - period: nil, - scheduler: scheduler - ) -} - extension Observable where Element: SignedIntegerType { /** Returns an observable sequence that produces a single value at the specified absolute due time, using the specified scheduler to run the timer. @@ -202,12 +152,6 @@ extension ObservableType { -> Observable { return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler) } - - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func take(duration: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler) - } } // MARK: skip @@ -228,12 +172,6 @@ extension ObservableType { -> Observable { return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler) } - - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func skip(duration: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler) - } } // MARK: ignoreElements @@ -274,12 +212,6 @@ extension ObservableType { -> Observable { return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) } - - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func delaySubscription(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler) - } } // MARK: buffer @@ -345,12 +277,6 @@ extension ObservableType { return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.Timeout), scheduler: scheduler) } - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func timeout(dueTime: RxTimeInterval, _ scheduler: SchedulerType) - -> Observable { - return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.Timeout), scheduler: scheduler) - } - /** Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on. @@ -366,10 +292,4 @@ extension ObservableType { -> Observable { return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler) } - - @available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.") - public func timeout(dueTime: RxTimeInterval, other: O, _ scheduler: SchedulerType) - -> Observable { - return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler) - } } diff --git a/RxSwift/ObserverType+Extensions.swift b/RxSwift/ObserverType+Extensions.swift deleted file mode 100644 index 8ca24923..00000000 --- a/RxSwift/ObserverType+Extensions.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// ObserverType+Extensions.swift -// RxSwift -// -// Created by Krunoslav Zaher on 6/13/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -import Foundation - -@available(*, deprecated=2.0.0, message="Please use observer.on(event)") -public func send(observer: O, _ event: Event) { - observer.on(event) -} - -@available(*, deprecated=2.0.0, message="Please use observer.on(.Next(element))") -public func sendNext(observer: O, _ element: O.E) { - observer.on(.Next(element)) -} - -@available(*, deprecated=2.0.0, message="Please use observer.on(.Error(error))") -public func sendError(observer: O, _ error: ErrorType) { - observer.on(.Error(error)) -} - -@available(*, deprecated=2.0.0, message="Please use observer.on(.Completed)") -public func sendCompleted(observer: O) { - observer.on(.Completed) -} diff --git a/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift index a605593b..2494d3af 100644 --- a/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift +++ b/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift @@ -37,25 +37,6 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType { _queue = queue } - /** - Convenience init for scheduler that wraps one of the global concurrent dispatch queues. - - - parameter globalConcurrentQueuePriority: Target global dispatch queue. - */ - @available(*, deprecated=2.0.0, message="Use init(globalConcurrentQueueQOS:) instead.") - public convenience init(globalConcurrentQueuePriority: DispatchQueueSchedulerPriority) { - var priority: Int = 0 - switch globalConcurrentQueuePriority { - case .High: - priority = DISPATCH_QUEUE_PRIORITY_HIGH - case .Default: - priority = DISPATCH_QUEUE_PRIORITY_DEFAULT - case .Low: - priority = DISPATCH_QUEUE_PRIORITY_LOW - } - self.init(queue: dispatch_get_global_queue(priority, UInt(0))) - } - /** Convenience init for scheduler that wraps one of the global concurrent dispatch queues. diff --git a/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/RxSwift/Schedulers/ConcurrentMainScheduler.swift index 78a21e26..f1a25547 100644 --- a/RxSwift/Schedulers/ConcurrentMainScheduler.swift +++ b/RxSwift/Schedulers/ConcurrentMainScheduler.swift @@ -35,9 +35,6 @@ public final class ConcurrentMainScheduler : SchedulerType { _mainScheduler = mainScheduler } - @available(*, deprecated=2.0.0, message="Please use `ConcurrentMainScheduler.instance`") - public static let sharedInstance = ConcurrentMainScheduler(mainScheduler: MainScheduler.instance) - /** Singleton instance of `ConcurrentMainScheduler` */ diff --git a/RxSwift/Schedulers/DispatchQueueSchedulerPriority.swift b/RxSwift/Schedulers/DispatchQueueSchedulerPriority.swift deleted file mode 100644 index 80ecada1..00000000 --- a/RxSwift/Schedulers/DispatchQueueSchedulerPriority.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// DispatchQueueSchedulerPriority.swift -// RxSwift -// -// Created by Krunoslav Zaher on 7/5/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -import Foundation - -/** -Identifies one of the global concurrent dispatch queues with specified priority. -*/ -@available(*, deprecated=2.0.0, message="Use DispatchQueueSchedulerQOS instead.") -public enum DispatchQueueSchedulerPriority { - - /** - Identifies global dispatch queue with `DISPATCH_QUEUE_PRIORITY_HIGH` - */ - case High - - /** - Identifies global dispatch queue with `DISPATCH_QUEUE_PRIORITY_DEFAULT` - */ - case Default - - /** - Identifies global dispatch queue with `DISPATCH_QUEUE_PRIORITY_LOW` - */ - case Low -} diff --git a/RxSwift/Schedulers/MainScheduler.swift b/RxSwift/Schedulers/MainScheduler.swift index 4648e3b9..7fd7d216 100644 --- a/RxSwift/Schedulers/MainScheduler.swift +++ b/RxSwift/Schedulers/MainScheduler.swift @@ -29,12 +29,6 @@ public final class MainScheduler : SerialDispatchQueueScheduler { super.init(serialQueue: _mainQueue) } - /** - Singleton instance of `MainScheduler` - */ - @available(*, deprecated=2.0.0, message="Please use `MainScheduler.instance`") - public static let sharedInstance = MainScheduler() - /** Singleton instance of `MainScheduler` */ diff --git a/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift index eb6afb8b..89a00ca8 100644 --- a/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift +++ b/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift @@ -73,26 +73,6 @@ public class SerialDispatchQueueScheduler: SchedulerType { self.init(serialQueue: serialQueue) } - /** - Constructs new `SerialDispatchQueueScheduler` that wraps on of the global concurrent dispatch queues. - - - parameter globalConcurrentQueuePriority: Identifier for global dispatch queue with specified priority. - - parameter internalSerialQueueName: Custom name for internal serial dispatch queue proxy. - */ - @available(*, deprecated=2.0.0, message="Use init(globalConcurrentQueueQOS:,internalSerialQueueName:) instead.") - public convenience init(globalConcurrentQueuePriority: DispatchQueueSchedulerPriority, internalSerialQueueName: String = "rx.global_dispatch_queue.serial") { - var priority: Int = 0 - switch globalConcurrentQueuePriority { - case .High: - priority = DISPATCH_QUEUE_PRIORITY_HIGH - case .Default: - priority = DISPATCH_QUEUE_PRIORITY_DEFAULT - case .Low: - priority = DISPATCH_QUEUE_PRIORITY_LOW - } - self.init(queue: dispatch_get_global_queue(priority, UInt(0)), internalSerialQueueName: internalSerialQueueName) - } - /** Constructs new `SerialDispatchQueueScheduler` that wraps on of the global concurrent dispatch queues. diff --git a/RxSwift/Subjects/Variable.swift b/RxSwift/Subjects/Variable.swift index 4409eaa6..1bab2422 100644 --- a/RxSwift/Subjects/Variable.swift +++ b/RxSwift/Subjects/Variable.swift @@ -14,9 +14,7 @@ Variable is a wrapper for `BehaviorSubject`. Unlike `BehaviorSubject` it can't terminate with error, and when variable is deallocated it will complete it's observable sequence (`asObservable`). */ -@available(*, deprecated=2.0.0, message="Variable will remain in the 2.0.0 API, but just use `variable.asObservable()` because it won't be `ObservableType` (no way to warn about deprecated interface implementation). Just do, `variable.asObservable().map { _ in ...}` and ignore this warning.") -public class Variable - : ObservableType { // << -- this part and subscribe method will be deprecated +public class Variable { public typealias E = Element @@ -58,19 +56,6 @@ public class Variable _subject = BehaviorSubject(value: value) } - /** - Subscribes an observer to sequence of variable values. - - Immediately upon subscription current value is sent to the observer. - - - parameter observer: Observer to subscribe to variable values. - - returns: Disposable object that can be used to unsubscribe the observer from the variable. - */ - @warn_unused_result(message="http://git.io/rxs.ud") - public func subscribe(observer: O) -> Disposable { - return _subject.subscribe(observer) - } - /** - returns: Canonical interface for push style sequence */ diff --git a/Sources/RxSwift/DispatchQueueSchedulerPriority.swift b/Sources/RxSwift/DispatchQueueSchedulerPriority.swift deleted file mode 120000 index ef7f23a0..00000000 --- a/Sources/RxSwift/DispatchQueueSchedulerPriority.swift +++ /dev/null @@ -1 +0,0 @@ -../../RxSwift/Schedulers/DispatchQueueSchedulerPriority.swift \ No newline at end of file diff --git a/Sources/RxSwift/ObserverType+Extensions.swift b/Sources/RxSwift/ObserverType+Extensions.swift deleted file mode 120000 index 01e1e0be..00000000 --- a/Sources/RxSwift/ObserverType+Extensions.swift +++ /dev/null @@ -1 +0,0 @@ -../../RxSwift/ObserverType+Extensions.swift \ No newline at end of file diff --git a/Sources/RxSwift/ScopedDisposable.swift b/Sources/RxSwift/ScopedDisposable.swift deleted file mode 120000 index 3d2e0839..00000000 --- a/Sources/RxSwift/ScopedDisposable.swift +++ /dev/null @@ -1 +0,0 @@ -../../RxSwift/Disposables/ScopedDisposable.swift \ No newline at end of file diff --git a/Tests/RxCocoaTests/Control+RxTests+UIKit.swift b/Tests/RxCocoaTests/Control+RxTests+UIKit.swift index 95bea265..eefc151c 100644 --- a/Tests/RxCocoaTests/Control+RxTests+UIKit.swift +++ b/Tests/RxCocoaTests/Control+RxTests+UIKit.swift @@ -179,7 +179,7 @@ extension ControlTests { func testLabel_NextElementsSetsValue() { let subject = UILabel() let attributedTextSequence = Variable(nil) - let disposable = attributedTextSequence.subscribe(subject.rx_attributedText) + let disposable = attributedTextSequence.asObservable().bindTo(subject.rx_attributedText) defer { disposable.dispose() } attributedTextSequence.value = NSAttributedString(string: "Hello!") @@ -354,7 +354,7 @@ extension ControlTests { let subject = UIActivityIndicatorView() let boolSequence = Variable(false) - let disposable = boolSequence.subscribe(subject.rx_animating) + let disposable = boolSequence.asObservable().bindTo(subject.rx_animating) defer { disposable.dispose() } boolSequence.value = true @@ -368,26 +368,6 @@ extension ControlTests { #if os(iOS) -// UIActionSheet -extension ControlTests { - func testActionSheet_DelegateEventCompletesOnDealloc() { - let createActionSheet: () -> UIActionSheet = { UIActionSheet(title: "", delegate: nil, cancelButtonTitle: "", destructiveButtonTitle: "") } - ensureEventDeallocated(createActionSheet) { (view: UIActionSheet) in view.rx_clickedButtonAtIndex } - ensureEventDeallocated(createActionSheet) { (view: UIActionSheet) in view.rx_didDismissWithButtonIndex } - ensureEventDeallocated(createActionSheet) { (view: UIActionSheet) in view.rx_willDismissWithButtonIndex } - } -} - -// UIAlertView -extension ControlTests { - func testAlertView_DelegateEventCompletesOnDealloc() { - let createAlertView: () -> UIAlertView = { UIAlertView(title: "", message: "", delegate: nil, cancelButtonTitle: nil) } - ensureEventDeallocated(createAlertView) { (view: UIAlertView) in view.rx_clickedButtonAtIndex } - ensureEventDeallocated(createAlertView) { (view: UIAlertView) in view.rx_didDismissWithButtonIndex } - ensureEventDeallocated(createAlertView) { (view: UIAlertView) in view.rx_willDismissWithButtonIndex } - } -} - // UIDatePicker extension ControlTests { func testDatePicker_DelegateEventCompletesOnDealloc() { diff --git a/Tests/RxCocoaTests/KVOObservableTests.swift b/Tests/RxCocoaTests/KVOObservableTests.swift index 8a208ee7..faa5e50d 100644 --- a/Tests/RxCocoaTests/KVOObservableTests.swift +++ b/Tests/RxCocoaTests/KVOObservableTests.swift @@ -1582,214 +1582,3 @@ extension KVOObservableTests { } } #endif - -// MARK: Deprecated -extension KVOObservableTests { - func testObserve_deprecated_ObserveCGRect() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGRect? = nil - - XCTAssertTrue(latest == nil) - - let d = root.rx_observe("frame") - .subscribeNext { (n: CGRect?) in - latest = n - } - - defer { - d.dispose() - } - - XCTAssertTrue(latest == root.frame) - - root.frame = CGRectMake(-2, 0, 0, 1) - - XCTAssertTrue(latest == CGRectMake(-2, 0, 0, 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == CGRectMake(-2, 0, 0, 1)) - XCTAssertTrue(!rootDeallocated) - } - - func testObserve_deprecated_ObserveCGSize() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGSize? = nil - - XCTAssertTrue(latest == nil) - - let d = root.rx_observe("size") - .subscribeNext { (n: CGSize?) in - latest = n - } - - defer { - d.dispose() - } - - XCTAssertTrue(latest == root.size) - - root.size = CGSizeMake(56, 1) - - XCTAssertTrue(latest == CGSizeMake(56, 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == CGSizeMake(56, 1)) - XCTAssertTrue(!rootDeallocated) - } - - func testObserve_deprecated_ObserveCGPoint() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGPoint? = nil - - XCTAssertTrue(latest == nil) - - let d = root.rx_observe("point") - .subscribeNext { (n: CGPoint?) in - latest = n - } - defer { - d.dispose() - } - - XCTAssertTrue(latest == root.point) - - root.point = CGPoint(x: -100, y: 1) - - XCTAssertTrue(latest == CGPoint(x: -100, y: 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == CGPoint(x: -100, y: 1)) - XCTAssertTrue(!rootDeallocated) - } -} - -#if !DISABLE_SWIZZLING -extension KVOObservableTests { - func testObserveWeak_deprecated_ObserveCGRect() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGRect? = nil - - XCTAssertTrue(latest == nil) - - _ = root - .rx_observeWeakly("frame") - .subscribeNext { (n: CGRect?) in - latest = n - } - XCTAssertTrue(latest == root.frame) - - root.frame = CGRectMake(-2, 0, 0, 1) - - XCTAssertTrue(latest == CGRectMake(-2, 0, 0, 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == nil) - XCTAssertTrue(rootDeallocated) - } - - func testObserveWeak_deprecated_ObserveCGSize() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGSize? = nil - - XCTAssertTrue(latest == nil) - - _ = root - .rx_observeWeakly("size") - .subscribeNext { (n: CGSize?) in - latest = n - } - XCTAssertTrue(latest == root.size) - - root.size = CGSizeMake(56, 1) - - XCTAssertTrue(latest == CGSizeMake(56, 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == nil) - XCTAssertTrue(rootDeallocated) - } - - func testObserveWeak_deprecated_ObserveCGPoint() { - var root: HasStrongProperty! = HasStrongProperty() - - var latest: CGPoint? = nil - - XCTAssertTrue(latest == nil) - - _ = root - .rx_observeWeakly("point") - .subscribeNext { (n: CGPoint?) in - latest = n - } - - XCTAssertTrue(latest == root.point) - - root.point = CGPoint(x: -100, y: 1) - - XCTAssertTrue(latest == CGPoint(x: -100, y: 1)) - - var rootDeallocated = false - - _ = root - .rx_deallocated - .subscribeCompleted { - rootDeallocated = true - } - - root = nil - - XCTAssertTrue(latest == nil) - XCTAssertTrue(rootDeallocated) - } -} -#endif