From 1a59524fc964df5c11a650aa1b6358b831ef8d83 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Tue, 1 Sep 2015 13:19:28 +0200 Subject: [PATCH] Fixes URLs in README.md --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d5575e0c..9583125b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Xcode 7 beta 6 (7A192o) / Swift 2.0 required **This README.md describes alpha version of RxSwift 2.0.** -**You can find RxSwift 1.9 for Swift 1.2 [here](https://github.com/ReactiveX/RxSwift/tree/master).** +**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.** @@ -456,8 +456,8 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever # Podfile use_frameworks! -pod 'RxSwift', :git => "git@github.com:ReactiveX/RxSwift.git", :branch => 'rxswift-2.0' -pod 'RxCocoa', :git => "git@github.com:ReactiveX/RxSwift.git", :branch => 'rxswift-2.0' +pod 'RxSwift' +pod 'RxCocoa' ``` type in `Podfile` directory @@ -471,7 +471,7 @@ $ pod install Add this to `Cartfile` ``` -git "git@github.com:ReactiveX/RxSwift.git" "rxswift-2.0" +git "git@github.com:ReactiveX/RxSwift.git" ``` ``` @@ -484,8 +484,6 @@ $ carthage update ``` $ git submodule add git@github.com:ReactiveX/RxSwift.git -$ cd RxSwift -$ git checkout rxswift-2.0 ``` * Drag `Rx.xcodeproj` into Project Navigator