Skip to content

Commit

Permalink
Updates documentation.
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Jan 1, 2016
1 parent 12bfa3d commit 1c47f0a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 1 addition & 3 deletions Documentation/Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ We've made a proof of concept for Linux.

To test it, create `Package.swift` in your test directory with the following content:

**This will start to work once we release 2.0.0 because it looks like spm has some issues dealing with prerelease versions. Running `swift build` inside RxSwift repository will work on Linux.**

```
import PackageDescription
Expand All @@ -30,4 +28,4 @@ What does work:
What doesn't work:
* Schedulers - because they are dependent on https://github.com/apple/swift-corelibs-libdispatch and it still hasn't been released
* Multithreading - still no access to c11 locks
* For some reason it looks like Swift compiler generates wrong code when using `ErrorType` on `Linux`, so don't use errors, otherwise you can get weird crashes.
* For some reason it looks like Swift compiler generates wrong code when using `ErrorType` on `Linux`, so don't use errors, otherwise you can get weird crashes.
16 changes: 6 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@

Xcode 7 Swift 2.1 required

**This README.md describes RxSwift 2.0.0 RC.**
**This README.md describes RxSwift 2.0.0**

**You can find RxSwift 1.9 for Swift 1.2 [here](https://github.com/ReactiveX/RxSwift/tree/rxswift-1.0).**

**Don't worry, we will be applying critical hotfixes to 1.9 version, but since the entire ecosystem is migrating towards Swift 2.0, we will be focusing on adding new features only to RxSwift 2.0 version.**

**We will support all environments where Swift 2.0 will run.**

### Change Log (from 1.9 version)

* Removes deprecated APIs
Expand Down Expand Up @@ -467,10 +463,10 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
# Podfile
use_frameworks!
pod 'RxSwift', '~> 2.0.0-rc'
pod 'RxCocoa', '~> 2.0.0-rc'
pod 'RxBlocking', '~> 2.0.0-rc'
pod 'RxTests', '~> 2.0.0-rc'
pod 'RxSwift', '~> 2.0'
pod 'RxCocoa', '~> 2.0'
pod 'RxBlocking', '~> 2.0'
pod 'RxTests', '~> 2.0'
```

type in `Podfile` directory
Expand All @@ -486,7 +482,7 @@ $ pod install
Add this to `Cartfile`

```
github "ReactiveX/RxSwift" "2.0.0-rc.0"
github "ReactiveX/RxSwift" ~> 2.0
```

```
Expand Down

0 comments on commit 1c47f0a

Please sign in to comment.