Skip to content

Commit

Permalink
6.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
freak4pc committed Oct 6, 2020
1 parent 21dceed commit a825182
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 30 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.

---

## 6.0.0-beta.1
## 6.0.0-rc.1

**Note 1**: RxSwift 6 and above has a minimum deployment target of iOS 9 and targets Swift 5.1 (Xcode 11) and above
**Note 2**: Starting with RxSwift 6.x, RxSwift will no longer follow Swift versioning. Meaning, RxSwift can possibly move to v6, v7 or v8 while Swift itself is still in 5.x.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'danger'
gem 'cocoapods', '~> 1.7.0'
gem 'cocoapods', '~> 1.9'
28 changes: 21 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,25 @@ GEM
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.4)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.7.5)
cocoapods (1.9.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.5)
cocoapods-core (= 1.9.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
Expand All @@ -33,11 +36,15 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.5)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.3)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
Expand All @@ -52,7 +59,7 @@ GEM
concurrent-ruby (1.1.7)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.0.5)
danger (8.0.6)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand All @@ -66,17 +73,22 @@ GEM
octokit (~> 4.7)
terminal-table (~> 1)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
ffi (1.13.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.7.0)
rchardet (~> 1.8)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -102,6 +114,8 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
Expand All @@ -116,7 +130,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.7.0)
cocoapods (~> 1.9)
danger

BUNDLED WITH
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<img src="https://raw.githubusercontent.com/ReactiveX/RxSwift/main/assets/Rx_Logo_M.png" alt="Miss Electric Eel 2016" width="36" height="36"> RxSwift: ReactiveX for Swift
======================================

[![Travis CI](https://github.com/ReactiveX/RxSwift/workflows/RxSwift/badge.svg?branch=rxswift6)](https://actions-badge.atrox.dev/ReactiveX/RxSwift/goto) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) [![pod](https://img.shields.io/cocoapods/v/RxSwift.svg)](https://cocoapods.org/pods/RxSwift) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)

<a href="" target="_blank" alt="Build Status" title="Build Status"><img src="" alt="Build Status" title="Build Status"></a>
[![Build Status](https://github.com/ReactiveX/RxSwift/workflows/RxSwift/badge.svg?branch=main)](https://actions-badge.atrox.dev/ReactiveX/RxSwift/goto) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) [![pod](https://img.shields.io/cocoapods/v/RxSwift.svg)](https://cocoapods.org/pods/RxSwift) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)

Rx is a [generic abstraction of computation](https://youtu.be/looJcaeboBY) expressed through `Observable<Element>` interface.

Expand Down Expand Up @@ -126,10 +124,10 @@ searchResults

## Requirements

* Xcode 11.x
* Xcode 12.x
* Swift 5.x

For Xcode 10.3.1 and below, [use RxSwift 5.0.1](https://github.com/ReactiveX/RxSwift/releases/tag/5.0.1).
For Xcode 11 and below, [use RxSwift 5.x](https://github.com/ReactiveX/RxSwift/releases/tag/5.0.1).

This comment has been minimized.

Copy link
@n8gray

n8gray Nov 20, 2020

Does the URL need to be updated as well?

This comment has been minimized.

Copy link
@freak4pc

freak4pc Nov 21, 2020

Author Member

It could change to 5.1.1, not too critical though


## Installation

Expand All @@ -148,14 +146,14 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
use_frameworks!

target 'YOUR_TARGET_NAME' do
pod 'RxSwift', '~> 5'
pod 'RxCocoa', '~> 5'
pod 'RxSwift', '6.0.0-rc.1'
pod 'RxCocoa', '6.0.0-rc.1'
end

# RxTest and RxBlocking make the most sense in the context of unit/integration tests
target 'YOUR_TESTING_TARGET' do
pod 'RxBlocking', '~> 5'
pod 'RxTest', '~> 5'
pod 'RxBlocking', '6.0.0-rc.1'
pod 'RxTest', '6.0.0-rc.1'
end
```

Expand All @@ -172,7 +170,7 @@ Officially supported: Carthage 0.33 and up.
Add this to `Cartfile`

```
github "ReactiveX/RxSwift" ~> 5.0
github "ReactiveX/RxSwift" '6.0.0-rc.1'
```

```bash
Expand All @@ -193,6 +191,8 @@ carthage build RxSwift --platform iOS

### [Swift Package Manager](https://github.com/apple/swift-package-manager)

> **Note**: There is a critical cross-dependency bug affecting many projects including RxSwift in Swift Package Manager. We've [filed a bug (SR-12303)](https://bugs.swift.org/browse/SR-12303) in early 2020 but have eno answer yet. Your mileage may vary.
Create a `Package.swift` file.

```swift
Expand All @@ -203,7 +203,7 @@ import PackageDescription
let package = Package(
name: "RxTestProject",
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
.package(url: "https://github.com/ReactiveX/RxSwift.git", .exact("6.0.0-rc.1"))
],
targets: [
.target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"])
Expand Down
4 changes: 2 additions & 2 deletions 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 = "6.0.0-beta.1"
s.version = "6.0.0-rc.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 All @@ -25,6 +25,6 @@ Waiting for observable sequence to complete before exiting command line applicat
s.source_files = 'RxBlocking/**/*.swift', 'Platform/**/*.swift'
s.exclude_files = 'RxBlocking/Platform/**/*.swift'

s.dependency 'RxSwift', '>=6.0.0.beta-1'
s.dependency 'RxSwift', '6.0.0-rc.1'
s.swift_version = '5.1'
end
6 changes: 3 additions & 3 deletions 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 = "6.0.0-beta.1"
s.version = "6.0.0-rc.1"
s.summary = "RxSwift Cocoa extensions"
s.description = <<-DESC
* UI extensions
Expand All @@ -22,8 +22,8 @@ Pod::Spec.new do |s|
s.source_files = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift'
s.exclude_files = 'RxCocoa/Platform/**/*.swift', 'Platform/AtomicInt.swift'

s.dependency 'RxSwift', '>=6.0.0.beta-1'
s.dependency 'RxRelay', '>=6.0.0.beta-1'
s.dependency 'RxSwift', '6.0.0-rc.1'
s.dependency 'RxRelay', '6.0.0-rc.1'

s.swift_version = '5.1'
end
4 changes: 2 additions & 2 deletions RxRelay.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxRelay"
s.version = "6.0.0-beta.1"
s.version = "6.0.0-rc.1"
s.summary = "Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay"
s.description = <<-DESC
Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay
Expand All @@ -24,6 +24,6 @@ Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay

s.source_files = 'RxRelay/**/*.{swift,h,m}'

s.dependency 'RxSwift', '>=6.0.0.beta-1'
s.dependency 'RxSwift', '6.0.0-rc.1'
s.swift_version = '5.1'
end
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 = "6.0.0-beta.1"
s.version = "6.0.0-rc.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
4 changes: 2 additions & 2 deletions 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 = "6.0.0-beta.1"
s.version = "6.0.0-rc.1"
s.summary = "RxSwift Testing extensions"
s.description = <<-DESC
Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
Expand Down Expand Up @@ -56,7 +56,7 @@ func testMap() {

s.framework = 'XCTest'

s.dependency 'RxSwift', '>=6.0.0.beta-1'
s.dependency 'RxSwift', '6.0.0-rc.1'
s.swift_version = '5.1'

s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
Expand Down

0 comments on commit a825182

Please sign in to comment.