Skip to content

Commit 94718e4

Browse files
committed
Release 2.6.1
1 parent 39ef59b commit 94718e4

File tree

11 files changed

+16
-12
lines changed

11 files changed

+16
-12
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

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.

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.

RxTests.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 = "RxTests"
3-
s.version = "2.6.0"
3+
s.version = "2.6.1"
44
s.summary = "RxSwift Testing extensions"
55
s.description = <<-DESC
66
Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
@@ -55,7 +55,7 @@ func testMap() {
5555

5656
s.framework = 'XCTest'
5757

58-
s.dependency 'RxSwift', '~> 2.5'
58+
s.dependency 'RxSwift', '~> 2.6'
5959

6060
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
6161
end

RxTests/Info.plist

0 Bytes
Binary file not shown.

scripts/all-tests.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,10 @@ if [ "${RELEASE_TEST}" -eq 1 ]; then
5959
fi
6060

6161
if [ "${RELEASE_TEST}" -eq 1 ]; then
62-
scripts/validate-markdown.sh
62+
#scripts/validate-markdown.sh
6363
scripts/validate-podspec.sh
6464
fi
6565

66-
if [ "${RELEASE_TEST}" -eq 1 ]; then
67-
. scripts/automation-tests.sh
68-
fi
69-
7066
#make sure all tvOS tests pass
7167
if [ $TV_OS -eq 1 ]; then
7268
for configuration in ${CONFIGURATIONS[@]}

0 commit comments

Comments
 (0)