Skip to content

Commit f441ecf

Browse files
committed
Merge tag '2.6.1' into rxswift-2.0
2 parents 03636fa + dd4574c commit f441ecf

File tree

22 files changed

+1241
-97
lines changed

22 files changed

+1241
-97
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55

66
## Master
77

8+
## [2.6.1](https://github.com/ReactiveX/RxSwift/releases/tag/2.6.0)
9+
10+
#### Anomalies
11+
12+
* Fixes issues with locking strategy for subjects. #936
13+
* Improves behavior of data sources on iOS 10. #999
14+
815
## [2.6.0](https://github.com/ReactiveX/RxSwift/releases/tag/2.6.0)
916

1017
#### Features

Rx.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,9 @@
660660
C8941BE71BD56B0700A0E874 /* BlockingObservable+Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8941BE31BD56B0700A0E874 /* BlockingObservable+Operators.swift */; };
661661
C89461751BC6C1210055219D /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
662662
C89461761BC6C1220055219D /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
663+
C89579381DE1FD8C00DC9C9C /* Anomalies.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89579351DE1FD8000DC9C9C /* Anomalies.swift */; };
664+
C895793A1DE1FD8D00DC9C9C /* Anomalies.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89579351DE1FD8000DC9C9C /* Anomalies.swift */; };
665+
C895793B1DE1FD8E00DC9C9C /* Anomalies.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89579351DE1FD8000DC9C9C /* Anomalies.swift */; };
663666
C89CDB361BCB0DD7002063D9 /* ShareReplay1.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89CDB351BCB0DD7002063D9 /* ShareReplay1.swift */; };
664667
C89CDB371BCB0DD7002063D9 /* ShareReplay1.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89CDB351BCB0DD7002063D9 /* ShareReplay1.swift */; };
665668
C89CDB381BCB0DD7002063D9 /* ShareReplay1.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89CDB351BCB0DD7002063D9 /* ShareReplay1.swift */; };
@@ -1663,6 +1666,7 @@
16631666
C88FA53F1C25C4CC00CCFEA4 /* RxTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
16641667
C8941BDE1BD5695C00A0E874 /* BlockingObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockingObservable.swift; sourceTree = "<group>"; };
16651668
C8941BE31BD56B0700A0E874 /* BlockingObservable+Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BlockingObservable+Operators.swift"; sourceTree = "<group>"; };
1669+
C89579351DE1FD8000DC9C9C /* Anomalies.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Anomalies.swift; path = Tests/RxSwiftTests/Anomalies.swift; sourceTree = SOURCE_ROOT; };
16661670
C89CDB351BCB0DD7002063D9 /* ShareReplay1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ShareReplay1.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
16671671
C8A56AD71AD7424700B4673B /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
16681672
C8B144FA1BD2D44500267DCE /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrentMainScheduler.swift; sourceTree = "<group>"; };
@@ -2328,6 +2332,7 @@
23282332
C83509011C38706D0027C24C /* Tests */ = {
23292333
isa = PBXGroup;
23302334
children = (
2335+
C89579351DE1FD8000DC9C9C /* Anomalies.swift */,
23312336
C83509021C38706D0027C24C /* AnonymousObservable+Test.swift */,
23322337
C83509031C38706D0027C24C /* AssumptionsTest.swift */,
23332338
C83509041C38706D0027C24C /* BagTest.swift */,
@@ -3473,6 +3478,7 @@
34733478
buildActionMask = 2147483647;
34743479
files = (
34753480
033C2EF61D081C460050C015 /* UIScrollView+RxTests.swift in Sources */,
3481+
C89579381DE1FD8C00DC9C9C /* Anomalies.swift in Sources */,
34763482
C83509661C38706E0027C24C /* RxTest.swift in Sources */,
34773483
C83509611C38706E0027C24C /* ObserverTests.swift in Sources */,
34783484
C83509471C38706E0027C24C /* PrimitiveMockObserver.swift in Sources */,
@@ -3562,6 +3568,7 @@
35623568
C83509F31C38755D0027C24C /* AssumptionsTest.swift in Sources */,
35633569
C83509ED1C3875580027C24C /* MySubject.swift in Sources */,
35643570
C83509C61C3875220027C24C /* NSObject+RxTests.swift in Sources */,
3571+
C895793B1DE1FD8E00DC9C9C /* Anomalies.swift in Sources */,
35653572
C83509BB1C38750D0027C24C /* Control+RxTests.swift in Sources */,
35663573
C83509EE1C3875580027C24C /* Observable.Extensions.swift in Sources */,
35673574
C83509BD1C38750D0027C24C /* ControlPropertyTests.swift in Sources */,
@@ -3679,6 +3686,7 @@
36793686
C83509CC1C3875230027C24C /* NSLayoutConstraint+RxTests.swift in Sources */,
36803687
C8350A0C1C38755E0027C24C /* Observable+CreationTest.swift in Sources */,
36813688
C8350A1C1C38756B0027C24C /* Observable+StandardSequenceOperatorsTest.swift in Sources */,
3689+
C895793A1DE1FD8D00DC9C9C /* Anomalies.swift in Sources */,
36823690
C83509CA1C3875230027C24C /* Driver+Test.swift in Sources */,
36833691
C83509E41C3875580027C24C /* MockDisposable.swift in Sources */,
36843692
C83509D51C38753E0027C24C /* RxObjCRuntimeState.swift in Sources */,

RxBlocking.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxBlocking"
3-
s.version = "2.6.0"
3+
s.version = "2.6.1"
44
s.summary = "RxSwift Blocking operatos"
55
s.description = <<-DESC
66
Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests
@@ -24,5 +24,5 @@ Waiting for observable sequence to complete before exiting command line applicat
2424

2525
s.source_files = 'RxBlocking/**/*.swift'
2626

27-
s.dependency 'RxSwift', '~> 2.5'
27+
s.dependency 'RxSwift', '~> 2.6'
2828
end

RxBlocking/Info.plist

0 Bytes
Binary file not shown.

RxCocoa.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxCocoa"
3-
s.version = "2.6.0"
3+
s.version = "2.6.1"
44
s.summary = "RxSwift Cocoa extensions"
55
s.description = <<-DESC
66
* UI extensions
@@ -25,5 +25,5 @@ Pod::Spec.new do |s|
2525
s.watchos.source_files = 'RxCocoa/iOS/**/*.swift'
2626
s.tvos.source_files = 'RxCocoa/iOS/**/*.swift'
2727

28-
s.dependency 'RxSwift', '~> 2.5'
28+
s.dependency 'RxSwift', '~> 2.6'
2929
end

RxCocoa/Info.plist

0 Bytes
Binary file not shown.

RxCocoa/iOS/Proxies/RxTableViewDataSourceProxy.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TableViewDataSourceNotSet
2424
}
2525

2626
func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
27-
rxAbstractMethodWithMessage(dataSourceNotSet)
27+
return 0
2828
}
2929

3030
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {

RxSwift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxSwift"
3-
s.version = "2.6.0"
3+
s.version = "2.6.1"
44
s.summary = "RxSwift is a Swift implementation of Reactive Extensions"
55
s.description = <<-DESC
66
This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX)

RxSwift/Info.plist

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)