Skip to content

Commit d52c3a8

Browse files
committed
Updates README.md
1 parent 12cccb1 commit d52c3a8

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

README.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
[![Travis CI](https://travis-ci.org/ReactiveX/RxSwift.svg?branch=master)](https://travis-ci.org/ReactiveX/RxSwift) ![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) [![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)
55

6-
* RxSwift 4.x / Swift 4.x can be found in [**rxswift4.0-swift4.0** branch](https://github.com/ReactiveX/RxSwift/tree/rxswift4.0-swift4.0).
7-
* RxSwift 3.x / Swift 3.x can be found in [**master** branch](https://github.com/ReactiveX/RxSwift/tree/master).
6+
* RxSwift 3.x / Swift 3.x can be found in [**rxswift-3.0** branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-3.0).
87

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

@@ -105,8 +104,9 @@ searchResults
105104

106105
## Requirements
107106

108-
* Xcode 8.0
109-
* Swift 3.0
107+
* Xcode 9.0
108+
* Swift 4.0
109+
* Swift 3.x ([use `rxswift-3.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-3.0) instead)
110110
* Swift 2.3 ([use `rxswift-2.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-2.0) instead)
111111

112112
## Installation
@@ -121,21 +121,21 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
121121

122122
### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
123123

124-
**Tested with `pod --version`: `1.1.1`**
124+
**Tested with `pod --version`: `1.3.1`**
125125

126126
```ruby
127127
# Podfile
128128
use_frameworks!
129129

130130
target 'YOUR_TARGET_NAME' do
131-
pod 'RxSwift', '~> 3.0'
132-
pod 'RxCocoa', '~> 3.0'
131+
pod 'RxSwift', '~> 4.0'
132+
pod 'RxCocoa', '~> 4.0'
133133
end
134134

135135
# RxTests and RxBlocking make the most sense in the context of unit/integration tests
136136
target 'YOUR_TESTING_TARGET' do
137-
pod 'RxBlocking', '~> 3.0'
138-
pod 'RxTest', '~> 3.0'
137+
pod 'RxBlocking', '~> 4.0'
138+
pod 'RxTest', '~> 4.0'
139139
end
140140
```
141141

@@ -147,12 +147,12 @@ $ pod install
147147

148148
### [Carthage](https://github.com/Carthage/Carthage)
149149

150-
**Tested with `carthage version`: `0.18.1`**
150+
**Tested with `carthage version`: `0.26.2`**
151151

152152
Add this to `Cartfile`
153153

154154
```
155-
github "ReactiveX/RxSwift" ~> 3.0
155+
github "ReactiveX/RxSwift" ~> 4.0
156156
```
157157

158158
```bash
@@ -161,19 +161,23 @@ $ carthage update
161161

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

164-
**Tested with `swift build --version`: `3.0.0 (swiftpm-19)`**
164+
**Tested with `swift build --version`: `Swift 4.0.0-dev (swiftpm-13126)`**
165165

166166
Create a `Package.swift` file.
167167

168168
```swift
169+
// swift-tools-version:4.0
170+
169171
import PackageDescription
170172

171173
let package = Package(
172-
name: "RxTestProject",
173-
targets: [],
174-
dependencies: [
175-
.Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
176-
]
174+
name: "RxTestProject",
175+
dependencies: [
176+
.package(url: "https://github.com/ReactiveX/RxSwift.git", "4.0.0" ..< "5.0.0")
177+
],
178+
targets: [
179+
.target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"])
180+
]
177181
)
178182
```
179183

0 commit comments

Comments
 (0)