Fixes documentation and podspecs.

This commit is contained in:
Krunoslav Zaher 2015-09-09 11:44:25 +02:00
parent 964d44d733
commit 15a252e5df
6 changed files with 30 additions and 12 deletions

View File

@ -111,6 +111,8 @@ Hang out with us on [rxswift.slack.com](http://slack.rxswift.org) <img src="http
1. [Hot and cold observables](Documentation/HotAndColdObservables.md)
1. [Feature comparison with other frameworks](#feature-comparison-with-other-frameworks)
1. [Roadmap](https://github.com/ReactiveX/RxSwift/wiki/roadmap)
1. [Playgrounds](#playgrounds)
1. [RxExamples](#rxexamples)
1. [References](#references)
## Why
@ -456,9 +458,9 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
# Podfile
use_frameworks!
pod 'RxSwift', '~> 2.0-alpha'
pod 'RxCocoa', '~> 2.0-alpha'
pod 'RxBlocking', '~> 2.0-alpha'
pod 'RxSwift', '~> 2.0.0-alpha'
pod 'RxCocoa', '~> 2.0.0-alpha'
pod 'RxBlocking', '~> 2.0.0-alpha'
```
type in `Podfile` directory
@ -472,7 +474,7 @@ $ pod install
Add this to `Cartfile`
```
git "git@github.com:ReactiveX/RxSwift.git" "2.0-alpha.1"
git "git@github.com:ReactiveX/RxSwift.git" "2.0.0-alpha.2"
```
```
@ -539,6 +541,22 @@ If you don't have a bridging header, you can go to your target's `Build Settings
** Comparison with RAC with respect to v3.0-RC.1
## Playgrounds
To use playgrounds:
* Open `Rx.xcworkspace`
* Build `RxSwift-OSX` scheme
* And then open `Rx` playground in `Rx.xcworkspace` tree view.
* Choose `View > Show Debug Area`
## RxExamples
To use playgrounds:
* Open `Rx.xcworkspace`
* Choose one of example schemes and hit `Run`.
## References
* [http://reactivex.io/](http://reactivex.io/)

View File

@ -4,8 +4,8 @@
1. Open `Rx.xcworkspace`
2. Build `RxSwift-OSX` scheme
3. And then open `RxSamples` in `Rx.xcworkspace` tree view.
4. View the console to view log strings. Choose `View > Show Debug Area`
3. And then open `Rx` playground in `Rx.xcworkspace` tree view.
4. Choose `View > Show Debug Area`
*/
/*:

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='6.0' target-platform='osx' requires-full-environment='true' display-mode='rendered'>
<playground version='6.0' target-platform='osx' requires-full-environment='true' display-mode='raw'>
<pages>
<page name='Index'/>
<page name='Introduction'/>

View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxBlocking"
s.version = "2.0-alpha.1"
s.version = "2.0.0-alpha.2"
s.summary = "RxSwift Blocking operatos"
s.description = <<-DESC
Set of blocking operators for unit testing
@ -17,5 +17,5 @@ Pod::Spec.new do |s|
s.source_files = 'RxBlocking/**/*.swift'
s.dependency 'RxSwift', '~> 2.0-alpha'
s.dependency 'RxSwift', '~> 2.0.0-alpha'
end

View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxCocoa"
s.version = "2.0-alpha.1"
s.version = "2.0.0-alpha.2"
s.summary = "RxSwift Cocoa extensions"
s.description = <<-DESC
* UI extensions
@ -21,5 +21,5 @@ Pod::Spec.new do |s|
s.ios.source_files = 'RxCocoa/iOS/**/*.swift'
s.osx.source_files = 'RxCocoa/OSX/**/*.swift'
s.dependency 'RxSwift', '~> 2.0-alpha'
s.dependency 'RxSwift', '~> 2.0.0-alpha'
end

View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxSwift"
s.version = "2.0-alpha.1"
s.version = "2.0.0-alpha.2"
s.summary = "Microsoft Reactive Extensions (Rx) for Swift and iOS/OSX platform"
s.description = <<-DESC
This is a Swift port of Reactive extensions.