Skip to content

Commit a825182

Browse files
committed
6.0.0-rc.1
1 parent 21dceed commit a825182

File tree

9 files changed

+44
-30
lines changed

9 files changed

+44
-30
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
33

44
---
55

6-
## 6.0.0-beta.1
6+
## 6.0.0-rc.1
77

88
**Note 1**: RxSwift 6 and above has a minimum deployment target of iOS 9 and targets Swift 5.1 (Xcode 11) and above
99
**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.

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22

33
gem 'danger'
4-
gem 'cocoapods', '~> 1.7.0'
4+
gem 'cocoapods', '~> 1.9'

Gemfile.lock

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ GEM
99
tzinfo (~> 1.1)
1010
addressable (2.7.0)
1111
public_suffix (>= 2.0.2, < 5.0)
12+
algoliasearch (1.27.4)
13+
httpclient (~> 2.8, >= 2.8.3)
14+
json (>= 1.5.1)
1215
atomos (0.1.3)
1316
claide (1.0.3)
1417
claide-plugins (0.9.2)
1518
cork
1619
nap
1720
open4 (~> 1.3)
18-
cocoapods (1.7.5)
21+
cocoapods (1.9.3)
1922
activesupport (>= 4.0.2, < 5)
2023
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.7.5)
24+
cocoapods-core (= 1.9.3)
2225
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2326
cocoapods-downloader (>= 1.2.2, < 2.0)
2427
cocoapods-plugins (>= 1.0.0, < 2.0)
2528
cocoapods-search (>= 1.0.0, < 2.0)
2629
cocoapods-stats (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.3.1, < 2.0)
30+
cocoapods-trunk (>= 1.4.0, < 2.0)
2831
cocoapods-try (>= 1.1.0, < 2.0)
2932
colored2 (~> 3.1)
3033
escape (~> 0.0.4)
@@ -33,11 +36,15 @@ GEM
3336
molinillo (~> 0.6.6)
3437
nap (~> 1.0)
3538
ruby-macho (~> 1.4)
36-
xcodeproj (>= 1.10.0, < 2.0)
37-
cocoapods-core (1.7.5)
39+
xcodeproj (>= 1.14.0, < 2.0)
40+
cocoapods-core (1.9.3)
3841
activesupport (>= 4.0.2, < 6)
42+
algoliasearch (~> 1.0)
43+
concurrent-ruby (~> 1.1)
3944
fuzzy_match (~> 2.0.4)
4045
nap (~> 1.0)
46+
netrc (~> 0.11)
47+
typhoeus (~> 1.0)
4148
cocoapods-deintegrate (1.0.4)
4249
cocoapods-downloader (1.4.0)
4350
cocoapods-plugins (1.0.0)
@@ -52,7 +59,7 @@ GEM
5259
concurrent-ruby (1.1.7)
5360
cork (0.3.0)
5461
colored2 (~> 3.1)
55-
danger (8.0.5)
62+
danger (8.0.6)
5663
claide (~> 1.0)
5764
claide-plugins (>= 0.9.2)
5865
colored2 (~> 3.1)
@@ -66,17 +73,22 @@ GEM
6673
octokit (~> 4.7)
6774
terminal-table (~> 1)
6875
escape (0.0.4)
76+
ethon (0.12.0)
77+
ffi (>= 1.3.0)
6978
faraday (1.0.1)
7079
multipart-post (>= 1.2, < 3)
7180
faraday-http-cache (2.2.0)
7281
faraday (>= 0.8)
82+
ffi (1.13.1)
7383
fourflusher (2.3.1)
7484
fuzzy_match (2.0.4)
7585
gh_inspector (1.1.3)
7686
git (1.7.0)
7787
rchardet (~> 1.8)
88+
httpclient (2.8.3)
7889
i18n (0.9.5)
7990
concurrent-ruby (~> 1.0)
91+
json (2.3.1)
8092
kramdown (2.3.0)
8193
rexml
8294
kramdown-parser-gfm (1.1.0)
@@ -102,6 +114,8 @@ GEM
102114
terminal-table (1.8.0)
103115
unicode-display_width (~> 1.1, >= 1.1.1)
104116
thread_safe (0.3.6)
117+
typhoeus (1.4.0)
118+
ethon (>= 0.9.0)
105119
tzinfo (1.2.7)
106120
thread_safe (~> 0.1)
107121
unicode-display_width (1.7.0)
@@ -116,7 +130,7 @@ PLATFORMS
116130
ruby
117131

118132
DEPENDENCIES
119-
cocoapods (~> 1.7.0)
133+
cocoapods (~> 1.9)
120134
danger
121135

122136
BUNDLED WITH

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<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
22
======================================
33

4-
[![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)
5-
6-
<a href="" target="_blank" alt="Build Status" title="Build Status"><img src="" alt="Build Status" title="Build Status"></a>
4+
[![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)
75

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

@@ -126,10 +124,10 @@ searchResults
126124

127125
## Requirements
128126

129-
* Xcode 11.x
127+
* Xcode 12.x
130128
* Swift 5.x
131129

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

134132
## Installation
135133

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

150148
target 'YOUR_TARGET_NAME' do
151-
pod 'RxSwift', '~> 5'
152-
pod 'RxCocoa', '~> 5'
149+
pod 'RxSwift', '6.0.0-rc.1'
150+
pod 'RxCocoa', '6.0.0-rc.1'
153151
end
154152

155153
# RxTest and RxBlocking make the most sense in the context of unit/integration tests
156154
target 'YOUR_TESTING_TARGET' do
157-
pod 'RxBlocking', '~> 5'
158-
pod 'RxTest', '~> 5'
155+
pod 'RxBlocking', '6.0.0-rc.1'
156+
pod 'RxTest', '6.0.0-rc.1'
159157
end
160158
```
161159

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

174172
```
175-
github "ReactiveX/RxSwift" ~> 5.0
173+
github "ReactiveX/RxSwift" '6.0.0-rc.1'
176174
```
177175

178176
```bash
@@ -193,6 +191,8 @@ carthage build RxSwift --platform iOS
193191

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

194+
> **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.
195+
196196
Create a `Package.swift` file.
197197

198198
```swift
@@ -203,7 +203,7 @@ import PackageDescription
203203
let package = Package(
204204
name: "RxTestProject",
205205
dependencies: [
206-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
206+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .exact("6.0.0-rc.1"))
207207
],
208208
targets: [
209209
.target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"])

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 = "6.0.0-beta.1"
3+
s.version = "6.0.0-rc.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
@@ -25,6 +25,6 @@ Waiting for observable sequence to complete before exiting command line applicat
2525
s.source_files = 'RxBlocking/**/*.swift', 'Platform/**/*.swift'
2626
s.exclude_files = 'RxBlocking/Platform/**/*.swift'
2727

28-
s.dependency 'RxSwift', '>=6.0.0.beta-1'
28+
s.dependency 'RxSwift', '6.0.0-rc.1'
2929
s.swift_version = '5.1'
3030
end

RxCocoa.podspec

Lines changed: 3 additions & 3 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 = "6.0.0-beta.1"
3+
s.version = "6.0.0-rc.1"
44
s.summary = "RxSwift Cocoa extensions"
55
s.description = <<-DESC
66
* UI extensions
@@ -22,8 +22,8 @@ Pod::Spec.new do |s|
2222
s.source_files = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift'
2323
s.exclude_files = 'RxCocoa/Platform/**/*.swift', 'Platform/AtomicInt.swift'
2424

25-
s.dependency 'RxSwift', '>=6.0.0.beta-1'
26-
s.dependency 'RxRelay', '>=6.0.0.beta-1'
25+
s.dependency 'RxSwift', '6.0.0-rc.1'
26+
s.dependency 'RxRelay', '6.0.0-rc.1'
2727

2828
s.swift_version = '5.1'
2929
end

RxRelay.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 = "RxRelay"
3-
s.version = "6.0.0-beta.1"
3+
s.version = "6.0.0-rc.1"
44
s.summary = "Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay"
55
s.description = <<-DESC
66
Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay
@@ -24,6 +24,6 @@ Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay
2424

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

27-
s.dependency 'RxSwift', '>=6.0.0.beta-1'
27+
s.dependency 'RxSwift', '6.0.0-rc.1'
2828
s.swift_version = '5.1'
2929
end

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 = "6.0.0-beta.1"
3+
s.version = "6.0.0-rc.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)

RxTest.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 = "RxTest"
3-
s.version = "6.0.0-beta.1"
3+
s.version = "6.0.0-rc.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
@@ -56,7 +56,7 @@ func testMap() {
5656

5757
s.framework = 'XCTest'
5858

59-
s.dependency 'RxSwift', '>=6.0.0.beta-1'
59+
s.dependency 'RxSwift', '6.0.0-rc.1'
6060
s.swift_version = '5.1'
6161

6262
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }

0 commit comments

Comments
 (0)