Skip to content

Commit a2348ce

Browse files
committed
Release 4.4.1
1 parent 268ccda commit a2348ce

File tree

12 files changed

+58
-43
lines changed

12 files changed

+58
-43
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file.
44
---
55
## Master
66

7+
## [4.4.1](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.1)
8+
79
* Adds `takeUntil(_ behavior:predicate:)`.
810

11+
#### Anomalies
12+
13+
* Fixes problems with RxAtomic and TSan. #1853
14+
* Fixes problem with passing 0 count to `Observable.range`. #1870
15+
* Fixes Swift 5.0 warnings. #1859
16+
* Fixes problem with RxCocoa and `DISABLE_SWIZZLING` flag. #1805
17+
* Internal cleanups:
18+
* Unused code deletions.
19+
* Adds SwiftLint.
20+
* Removes legacy Swift 3.0 conditional compilation flags.
21+
922
## [4.4.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.0)
1023

1124
**This release introduces a new framework `RxAtomic` that enables using C11 atomic primitives in RxSwift as a replacement for deprecated `OSAtomic*` functions.**

Package.swift

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,65 @@ import PackageDescription
44

55
let buildTests = true
66

7-
func filterNil<T>(_ array: [T?]) -> [T] {
8-
return array.flatMap { $0 }
9-
}
10-
117
extension Product {
12-
static func allTests() -> Product? {
8+
static func allTests() -> [Product] {
139
if buildTests {
14-
return .executable(name: "AllTestz", targets: ["AllTestz"])
10+
return [.executable(name: "AllTestz", targets: ["AllTestz"])]
1511
} else {
16-
return nil
12+
return []
1713
}
1814
}
1915
}
2016

2117
extension Target {
22-
static func rxCocoa() -> Target? {
18+
static func rxCocoa() -> [Target] {
2319
#if os(Linux)
24-
return .target(name: "RxCocoa", dependencies: ["RxSwift"])
20+
return [.target(name: "RxCocoa", dependencies: ["RxSwift"])]
2521
#else
26-
return .target(name: "RxCocoa", dependencies: ["RxSwift", "RxCocoaRuntime"])
22+
return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxCocoaRuntime"])]
2723
#endif
2824
}
2925

30-
static func rxCocoaRuntime() -> Target? {
26+
static func rxCocoaRuntime() -> [Target] {
3127
#if os(Linux)
32-
return nil
28+
return []
3329
#else
34-
return .target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])
30+
return [.target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
3531
#endif
3632
}
3733

38-
static func allTests() -> Target? {
34+
static func allTests() -> [Target] {
3935
if buildTests {
40-
return .target(name: "AllTestz", dependencies: ["RxSwift", "RxCocoa", "RxBlocking", "RxTest"])
36+
return [.target(name: "AllTestz", dependencies: ["RxSwift", "RxCocoa", "RxBlocking", "RxTest"])]
4137
} else {
42-
return nil
38+
return []
4339
}
4440
}
4541
}
4642

4743
let package = Package(
4844
name: "RxSwift",
49-
products: filterNil([
50-
.library(name: "RxAtomic", targets: ["RxAtomic"]),
51-
.library(name: "RxSwift", targets: ["RxSwift"]),
52-
.library(name: "RxCocoa", targets: ["RxCocoa"]),
53-
.library(name: "RxBlocking", targets: ["RxBlocking"]),
54-
.library(name: "RxTest", targets: ["RxTest"]),
55-
.allTests(),
56-
]),
57-
targets: filterNil([
58-
.target(name: "RxAtomic", dependencies: []),
59-
.target(name: "RxSwift", dependencies: ["RxAtomic"]),
60-
.rxCocoa(),
61-
.rxCocoaRuntime(),
62-
.target(name: "RxBlocking", dependencies: ["RxSwift", "RxAtomic"]),
63-
.target(name: "RxTest", dependencies: ["RxSwift"]),
64-
.allTests(),
65-
])
45+
products: ([
46+
[
47+
.library(name: "RxAtomic", targets: ["RxAtomic"]),
48+
.library(name: "RxSwift", targets: ["RxSwift"]),
49+
.library(name: "RxCocoa", targets: ["RxCocoa"]),
50+
.library(name: "RxBlocking", targets: ["RxBlocking"]),
51+
.library(name: "RxTest", targets: ["RxTest"]),
52+
],
53+
Product.allTests()
54+
] as [[Product]]).flatMap { $0 },
55+
targets: ([
56+
[
57+
.target(name: "RxAtomic", dependencies: []),
58+
.target(name: "RxSwift", dependencies: ["RxAtomic"]),
59+
],
60+
Target.rxCocoa(),
61+
Target.rxCocoaRuntime(),
62+
[
63+
.target(name: "RxBlocking", dependencies: ["RxSwift", "RxAtomic"]),
64+
.target(name: "RxTest", dependencies: ["RxSwift"]),
65+
],
66+
Target.allTests()
67+
] as [[Target]]).flatMap { $0 }
6668
)

RxAtomic.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 = "RxAtomic"
3-
s.version = "4.4.0"
3+
s.version = "4.4.1"
44
s.summary = "Atomic primitives for RxSwift"
55
s.description = <<-DESC
66
Atomic primitives for RxSwift.

RxAtomic/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.4.0</string>
18+
<string>4.4.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
</dict>

RxBlocking.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 = "RxBlocking"
3-
s.version = "4.4.0"
3+
s.version = "4.4.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

RxBlocking/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.4.0</string>
18+
<string>4.4.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

RxCocoa.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 = "RxCocoa"
3-
s.version = "4.4.0"
3+
s.version = "4.4.1"
44
s.summary = "RxSwift Cocoa extensions"
55
s.description = <<-DESC
66
* UI extensions

RxCocoa/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.4.0</string>
18+
<string>4.4.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

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 = "4.4.0"
3+
s.version = "4.4.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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.4.0</string>
18+
<string>4.4.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)