Skip to content

Commit 58917c7

Browse files
kzaherkzaher
committed
Merge branch 'develop' into rxswift4.0-swift4.0
2 parents 16b296f + 4995928 commit 58917c7

File tree

6 files changed

+228
-135
lines changed

6 files changed

+228
-135
lines changed

‎.jazzy.yml

Lines changed: 132 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,135 @@
11
---
22
custom_categories:
3+
- name: RxCocoa/Common
4+
children:
5+
- Binder
6+
- ControlTarget
7+
- DelegateProxy
8+
- DelegateProxyType
9+
- NSLayoutConstraint+Rx
10+
- Observable+Bind
11+
- RxCocoaObjCRuntimeError+Extensions
12+
- RxTarget
13+
- SectionedViewDataSourceType
14+
- TextInput
15+
- name: RxCocoa
16+
children:
17+
- Deprecated
18+
- RxCocoa
19+
- name: RxCocoa/Foundation
20+
children:
21+
- KVORepresentable+CoreGraphics
22+
- KVORepresentable+Swift
23+
- KVORepresentable
24+
- Logging
25+
- NSObject+Rx+KVORepresentable
26+
- NSObject+Rx+RawRepresentable
27+
- NSObject+Rx
28+
- NotificationCenter+Rx
29+
- URLSession+Rx
30+
- name: RxCocoa/Platform
31+
children:
32+
- DispatchQueue+Extensions
33+
- name: RxCocoa/Traits
34+
children:
35+
- ControlEvent
36+
- ControlProperty
37+
- PublishRelay
38+
- name: RxCocoa/Traits/Driver
39+
children:
40+
- ControlEvent+Driver
41+
- ControlProperty+Driver
42+
- Driver+Subscription
43+
- Driver
44+
- ObservableConvertibleType+Driver
45+
- Variable+Driver
46+
- name: RxCocoa/Traits/SharedSequence
47+
children:
48+
- ObservableConvertibleType+SharedSequence
49+
- SchedulerType+SharedSequence
50+
- SharedSequence+Operators+arity
51+
- SharedSequence+Operators
52+
- SharedSequence
53+
- name: RxCocoa/Traits/Signal
54+
children:
55+
- ObservableConvertibleType+Signal
56+
- PublishRelay+Signal
57+
- Signal+Subscription
58+
- Signal
59+
- name: RxCocoa/iOS/DataSources
60+
children:
61+
- RxCollectionViewReactiveArrayDataSource
62+
- RxPickerViewAdapter
63+
- RxTableViewReactiveArrayDataSource
64+
- name: RxCocoa/iOS/Events
65+
children:
66+
- ItemEvents
67+
- name: RxCocoa/iOS
68+
children:
69+
- NSTextStorage+Rx
70+
- UIActivityIndicatorView+Rx
71+
- UIAlertAction+Rx
72+
- UIApplication+Rx
73+
- UIBarButtonItem+Rx
74+
- UIButton+Rx
75+
- UICollectionView+Rx
76+
- UIControl+Rx
77+
- UIDatePicker+Rx
78+
- UIGestureRecognizer+Rx
79+
- UIImageView+Rx
80+
- UILabel+Rx
81+
- UINavigationController+Rx
82+
- UINavigationItem+Rx
83+
- UIPageControl+Rx
84+
- UIPickerView+Rx
85+
- UIProgressView+Rx
86+
- UIRefreshControl+Rx
87+
- UIScrollView+Rx
88+
- UISearchBar+Rx
89+
- UISearchController+Rx
90+
- UISegmentedControl+Rx
91+
- UISlider+Rx
92+
- UIStepper+Rx
93+
- UISwitch+Rx
94+
- UITabBar+Rx
95+
- UITabBarController+Rx
96+
- UITabBarItem+Rx
97+
- UITableView+Rx
98+
- UITextField+Rx
99+
- UITextView+Rx
100+
- UIView+Rx
101+
- UIViewController+Rx
102+
- UIWebView+Rx
103+
- name: RxCocoa/iOS/Protocols
104+
children:
105+
- RxCollectionViewDataSourceType
106+
- RxPickerViewDataSourceType
107+
- RxTableViewDataSourceType
108+
- name: RxCocoa/iOS/Proxies
109+
children:
110+
- RxCollectionViewDataSourceProxy
111+
- RxCollectionViewDelegateProxy
112+
- RxNavigationControllerDelegateProxy
113+
- RxPickerViewDataSourceProxy
114+
- RxPickerViewDelegateProxy
115+
- RxScrollViewDelegateProxy
116+
- RxSearchBarDelegateProxy
117+
- RxSearchControllerDelegateProxy
118+
- RxTabBarControllerDelegateProxy
119+
- RxTabBarDelegateProxy
120+
- RxTableViewDataSourceProxy
121+
- RxTableViewDelegateProxy
122+
- RxTextStorageDelegateProxy
123+
- RxTextViewDelegateProxy
124+
- RxWebViewDelegateProxy
125+
- name: RxCocoa/macOS
126+
children:
127+
- NSButton+Rx
128+
- NSControl+Rx
129+
- NSImageView+Rx
130+
- NSSlider+Rx
131+
- NSTextField+Rx
132+
- NSView+Rx
3133
- name: RxSwift
4134
children:
5135
- AnyObserver
@@ -55,8 +185,8 @@ custom_categories:
55185
- AsSingle
56186
- Buffer
57187
- Catch
58-
- CombineLatest+arity
59188
- CombineLatest+Collection
189+
- CombineLatest+arity
60190
- CombineLatest
61191
- Concat
62192
- Create
@@ -114,8 +244,8 @@ custom_categories:
114244
- Using
115245
- Window
116246
- WithLatestFrom
117-
- Zip+arity
118247
- Zip+Collection
248+
- Zip+arity
119249
- Zip
120250
- name: RxSwift/Observers
121251
children:
@@ -175,133 +305,3 @@ custom_categories:
175305
- PrimitiveSequence+Zip+arity
176306
- PrimitiveSequence
177307
- Single
178-
- name: RxCocoa/Common
179-
children:
180-
- Binder
181-
- ControlTarget
182-
- DelegateProxy
183-
- DelegateProxyType
184-
- NSLayoutConstraint+Rx
185-
- Observable+Bind
186-
- RxCocoaObjCRuntimeError+Extensions
187-
- RxTarget
188-
- SectionedViewDataSourceType
189-
- TextInput
190-
- name: RxCocoa
191-
children:
192-
- Deprecated
193-
- RxCocoa
194-
- name: RxCocoa/Foundation
195-
children:
196-
- KVORepresentable+CoreGraphics
197-
- KVORepresentable+Swift
198-
- KVORepresentable
199-
- Logging
200-
- NotificationCenter+Rx
201-
- NSObject+Rx+KVORepresentable
202-
- NSObject+Rx+RawRepresentable
203-
- NSObject+Rx
204-
- URLSession+Rx
205-
- name: RxCocoa/iOS/DataSources
206-
children:
207-
- RxCollectionViewReactiveArrayDataSource
208-
- RxPickerViewAdapter
209-
- RxTableViewReactiveArrayDataSource
210-
- name: RxCocoa/iOS/Events
211-
children:
212-
- ItemEvents
213-
- name: RxCocoa/iOS
214-
children:
215-
- NSTextStorage+Rx
216-
- UIActivityIndicatorView+Rx
217-
- UIAlertAction+Rx
218-
- UIApplication+Rx
219-
- UIBarButtonItem+Rx
220-
- UIButton+Rx
221-
- UICollectionView+Rx
222-
- UIControl+Rx
223-
- UIDatePicker+Rx
224-
- UIGestureRecognizer+Rx
225-
- UIImageView+Rx
226-
- UILabel+Rx
227-
- UINavigationController+Rx
228-
- UINavigationItem+Rx
229-
- UIPageControl+Rx
230-
- UIPickerView+Rx
231-
- UIProgressView+Rx
232-
- UIRefreshControl+Rx
233-
- UIScrollView+Rx
234-
- UISearchBar+Rx
235-
- UISearchController+Rx
236-
- UISegmentedControl+Rx
237-
- UISlider+Rx
238-
- UIStepper+Rx
239-
- UISwitch+Rx
240-
- UITabBar+Rx
241-
- UITabBarController+Rx
242-
- UITabBarItem+Rx
243-
- UITableView+Rx
244-
- UITextField+Rx
245-
- UITextView+Rx
246-
- UIView+Rx
247-
- UIViewController+Rx
248-
- UIWebView+Rx
249-
- name: RxCocoa/iOS/Protocols
250-
children:
251-
- RxCollectionViewDataSourceType
252-
- RxPickerViewDataSourceType
253-
- RxTableViewDataSourceType
254-
- name: RxCocoa/iOS/Proxies
255-
children:
256-
- RxCollectionViewDataSourceProxy
257-
- RxCollectionViewDelegateProxy
258-
- RxNavigationControllerDelegateProxy
259-
- RxPickerViewDataSourceProxy
260-
- RxPickerViewDelegateProxy
261-
- RxScrollViewDelegateProxy
262-
- RxSearchBarDelegateProxy
263-
- RxSearchControllerDelegateProxy
264-
- RxTabBarControllerDelegateProxy
265-
- RxTabBarDelegateProxy
266-
- RxTableViewDataSourceProxy
267-
- RxTableViewDelegateProxy
268-
- RxTextStorageDelegateProxy
269-
- RxTextViewDelegateProxy
270-
- RxWebViewDelegateProxy
271-
- name: RxCocoa/macOS
272-
children:
273-
- NSButton+Rx
274-
- NSControl+Rx
275-
- NSImageView+Rx
276-
- NSSlider+Rx
277-
- NSTextField+Rx
278-
- NSView+Rx
279-
- name: RxCocoa/Platform
280-
children:
281-
- DispatchQueue+Extensions
282-
- name: RxCocoa/Traits
283-
children:
284-
- ControlEvent
285-
- ControlProperty
286-
- PublishRelay
287-
- name: RxCocoa/Traits/Driver
288-
children:
289-
- ControlEvent+Driver
290-
- ControlProperty+Driver
291-
- Driver+Subscription
292-
- Driver
293-
- ObservableConvertibleType+Driver
294-
- Variable+Driver
295-
- name: RxCocoa/Traits/SharedSequence
296-
children:
297-
- ObservableConvertibleType+SharedSequence
298-
- SchedulerType+SharedSequence
299-
- SharedSequence+Operators+arity
300-
- SharedSequence+Operators
301-
- SharedSequence
302-
- name: RxCocoa/Traits/Signal
303-
children:
304-
- ObservableConvertibleType+Signal
305-
- PublishRelay+Signal
306-
- Signal+Subscription
307-
- Signal

‎Sources/AllTestz/main.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ final class DisposableTest_ : DisposableTest, RxTestCase {
436436
("testDisposables_TestCreateWithNumberOfDisposables", DisposableTest.testDisposables_TestCreateWithNumberOfDisposables),
437437
("testRefCountDisposable_RefCounting", DisposableTest.testRefCountDisposable_RefCounting),
438438
("testRefCountDisposable_PrimaryDisposesFirst", DisposableTest.testRefCountDisposable_PrimaryDisposesFirst),
439+
("testScheduledDisposable_correctQueue", DisposableTest.testScheduledDisposable_correctQueue),
440+
("testSerialDisposable_firstDisposedThenSet", DisposableTest.testSerialDisposable_firstDisposedThenSet),
441+
("testSerialDisposable_firstSetThenDisposed", DisposableTest.testSerialDisposable_firstSetThenDisposed),
442+
("testSerialDisposable_firstSetThenSetAnotherThenDisposed", DisposableTest.testSerialDisposable_firstSetThenSetAnotherThenDisposed),
439443
("testSingleAssignmentDisposable_firstDisposedThenSet", DisposableTest.testSingleAssignmentDisposable_firstDisposedThenSet),
440444
("testSingleAssignmentDisposable_firstSetThenDisposed", DisposableTest.testSingleAssignmentDisposable_firstSetThenDisposed),
441445
("testSingleAssignmentDisposable_stress", DisposableTest.testSingleAssignmentDisposable_stress),

0 commit comments

Comments
 (0)