From 1c47f0a79231f889a6c954023d857a3b5344ac88 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sat, 2 Jan 2016 00:36:33 +0100 Subject: [PATCH] Updates documentation. --- Documentation/Linux.md | 4 +--- README.md | 16 ++++++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Documentation/Linux.md b/Documentation/Linux.md index 6ba059a6..d5ffce50 100644 --- a/Documentation/Linux.md +++ b/Documentation/Linux.md @@ -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 @@ -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. \ No newline at end of file +* 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. diff --git a/README.md b/README.md index e814054e..bec4f702 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 @@ -486,7 +482,7 @@ $ pod install Add this to `Cartfile` ``` -github "ReactiveX/RxSwift" "2.0.0-rc.0" +github "ReactiveX/RxSwift" ~> 2.0 ``` ```