Skip to content

Commit

Permalink
Release 4.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Feb 9, 2019
1 parent 268ccda commit a2348ce
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 43 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file.
---
## Master

## [4.4.1](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.1)

* Adds `takeUntil(_ behavior:predicate:)`.

#### Anomalies

* Fixes problems with RxAtomic and TSan. #1853
* Fixes problem with passing 0 count to `Observable.range`. #1870
* Fixes Swift 5.0 warnings. #1859
* Fixes problem with RxCocoa and `DISABLE_SWIZZLING` flag. #1805
* Internal cleanups:
* Unused code deletions.
* Adds SwiftLint.
* Removes legacy Swift 3.0 conditional compilation flags.

## [4.4.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.0)

**This release introduces a new framework `RxAtomic` that enables using C11 atomic primitives in RxSwift as a replacement for deprecated `OSAtomic*` functions.**
Expand Down
68 changes: 35 additions & 33 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,65 @@ import PackageDescription

let buildTests = true

func filterNil<T>(_ array: [T?]) -> [T] {
return array.flatMap { $0 }
}

extension Product {
static func allTests() -> Product? {
static func allTests() -> [Product] {
if buildTests {
return .executable(name: "AllTestz", targets: ["AllTestz"])
return [.executable(name: "AllTestz", targets: ["AllTestz"])]
} else {
return nil
return []
}
}
}

extension Target {
static func rxCocoa() -> Target? {
static func rxCocoa() -> [Target] {
#if os(Linux)
return .target(name: "RxCocoa", dependencies: ["RxSwift"])
return [.target(name: "RxCocoa", dependencies: ["RxSwift"])]
#else
return .target(name: "RxCocoa", dependencies: ["RxSwift", "RxCocoaRuntime"])
return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxCocoaRuntime"])]
#endif
}

static func rxCocoaRuntime() -> Target? {
static func rxCocoaRuntime() -> [Target] {
#if os(Linux)
return nil
return []
#else
return .target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])
return [.target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
#endif
}

static func allTests() -> Target? {
static func allTests() -> [Target] {
if buildTests {
return .target(name: "AllTestz", dependencies: ["RxSwift", "RxCocoa", "RxBlocking", "RxTest"])
return [.target(name: "AllTestz", dependencies: ["RxSwift", "RxCocoa", "RxBlocking", "RxTest"])]
} else {
return nil
return []
}
}
}

let package = Package(
name: "RxSwift",
products: filterNil([
.library(name: "RxAtomic", targets: ["RxAtomic"]),
.library(name: "RxSwift", targets: ["RxSwift"]),
.library(name: "RxCocoa", targets: ["RxCocoa"]),
.library(name: "RxBlocking", targets: ["RxBlocking"]),
.library(name: "RxTest", targets: ["RxTest"]),
.allTests(),
]),
targets: filterNil([
.target(name: "RxAtomic", dependencies: []),
.target(name: "RxSwift", dependencies: ["RxAtomic"]),
.rxCocoa(),
.rxCocoaRuntime(),
.target(name: "RxBlocking", dependencies: ["RxSwift", "RxAtomic"]),
.target(name: "RxTest", dependencies: ["RxSwift"]),
.allTests(),
])
products: ([
[
.library(name: "RxAtomic", targets: ["RxAtomic"]),
.library(name: "RxSwift", targets: ["RxSwift"]),
.library(name: "RxCocoa", targets: ["RxCocoa"]),
.library(name: "RxBlocking", targets: ["RxBlocking"]),
.library(name: "RxTest", targets: ["RxTest"]),
],
Product.allTests()
] as [[Product]]).flatMap { $0 },
targets: ([
[
.target(name: "RxAtomic", dependencies: []),
.target(name: "RxSwift", dependencies: ["RxAtomic"]),
],
Target.rxCocoa(),
Target.rxCocoaRuntime(),
[
.target(name: "RxBlocking", dependencies: ["RxSwift", "RxAtomic"]),
.target(name: "RxTest", dependencies: ["RxSwift"]),
],
Target.allTests()
] as [[Target]]).flatMap { $0 }
)
2 changes: 1 addition & 1 deletion RxAtomic.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxAtomic"
s.version = "4.4.0"
s.version = "4.4.1"
s.summary = "Atomic primitives for RxSwift"
s.description = <<-DESC
Atomic primitives for RxSwift.
Expand Down
2 changes: 1 addition & 1 deletion RxAtomic/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.4.0</string>
<string>4.4.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion RxBlocking.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxBlocking"
s.version = "4.4.0"
s.version = "4.4.1"
s.summary = "RxSwift Blocking operatos"
s.description = <<-DESC
Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests
Expand Down
2 changes: 1 addition & 1 deletion RxBlocking/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.4.0</string>
<string>4.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion RxCocoa.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxCocoa"
s.version = "4.4.0"
s.version = "4.4.1"
s.summary = "RxSwift Cocoa extensions"
s.description = <<-DESC
* UI extensions
Expand Down
2 changes: 1 addition & 1 deletion RxCocoa/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.4.0</string>
<string>4.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion RxSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxSwift"
s.version = "4.4.0"
s.version = "4.4.1"
s.summary = "RxSwift is a Swift implementation of Reactive Extensions"
s.description = <<-DESC
This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX)
Expand Down
2 changes: 1 addition & 1 deletion RxSwift/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.4.0</string>
<string>4.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion RxTest.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxTest"
s.version = "4.4.0"
s.version = "4.4.1"
s.summary = "RxSwift Testing extensions"
s.description = <<-DESC
Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
Expand Down
2 changes: 1 addition & 1 deletion RxTest/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.4.0</string>
<string>4.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit a2348ce

Please sign in to comment.