Skip to content

Commit 830232d

Browse files
authored
Merge pull request #542 from ReactiveCocoa/update-readme
Update the readme.
2 parents 91fd3f1 + 24d2d7d commit 830232d

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

README.md

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
</p>
66
<br />
77

8-
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](#carthage) [![CocoaPods compatible](https://img.shields.io/cocoapods/v/ReactiveSwift.svg)](#cocoapods) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-orange.svg)](#swift-package-manager) [![GitHub release](https://img.shields.io/github/release/ReactiveCocoa/ReactiveSwift.svg)](https://github.com/ReactiveCocoa/ReactiveSwift/releases) ![Swift 3.0.x](https://img.shields.io/badge/Swift-3.0.x-orange.svg) ![platforms](https://img.shields.io/badge/platform-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-lightgrey.svg)
8+
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](#carthage) [![CocoaPods compatible](https://img.shields.io/cocoapods/v/ReactiveSwift.svg)](#cocoapods) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-orange.svg)](#swift-package-manager) [![GitHub release](https://img.shields.io/github/release/ReactiveCocoa/ReactiveSwift.svg)](https://github.com/ReactiveCocoa/ReactiveSwift/releases) ![Swift 4.0](https://img.shields.io/badge/Swift-4.0-orange.svg) ![platforms](https://img.shields.io/badge/platform-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-lightgrey.svg)
99

10-
☕️ [Looking for Cocoa extensions?][ReactiveCocoa]
11-
🎉 [Getting Started](#getting-started)
10+
🎉 [Getting Started](#getting-started) 🚄 [Release Roadmap](#release-roadmap)
1211

13-
🚄 [Release Roadmap](#release-roadmap)
1412
## What is ReactiveSwift?
1513
__ReactiveSwift__ offers composable, declarative and flexible primitives that are built around the grand concept of ___streams of values over time___.
1614

@@ -29,6 +27,12 @@ code and state to bridge the gap.
2927
1. **[Basic Operators][]**
3028

3129
An overview of the operators provided to compose and transform streams of values.
30+
31+
1. **[ReactiveCocoa][ReactiveCocoa]**
32+
33+
Building on top of ReactiveSwift, **ReactiveCocoa** extends Cocoa platform frameworks with reactive bindings and extensions.
34+
35+
[![GitHub release](https://img.shields.io/github/release/ReactiveCocoa/ReactiveCocoa.svg)](https://github.com/ReactiveCocoa/ReactiveCocoa/releases)[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/ReactiveCocoa/ReactiveCocoa/#carthage) [![CocoaPods compatible](https://img.shields.io/cocoapods/v/ReactiveCocoa.svg)](https://github.com/ReactiveCocoa/ReactiveCocoa/#cocoapods)
3236

3337
1. **[How does ReactiveSwift relate to RxSwift?][]**
3438

@@ -125,17 +129,9 @@ If you need any help, please visit our [GitHub issues][] or [Stack Overflow][].
125129
## Release Roadmap
126130
**Current Stable Release:**<br />[![GitHub release](https://img.shields.io/github/release/ReactiveCocoa/ReactiveSwift.svg)](https://github.com/ReactiveCocoa/ReactiveSwift/releases)
127131

128-
#### Swift 3.2 and Swift 4.0 compatibility
129-
While the development would be Swift 3.2 and Swift 4.0 aware, ReactiveSwift 2.0 would not declare official support until Swift 3.2 and Swift 4.0 launch.
130-
131-
The official release for Swift 3.2 and Swift 4.0 is expected to be a minor 2.x release with full API compatibility.
132-
133132
### Plan of Record
134-
#### ReactiveCollections
135-
Collection support in ReactiveSwift is currently being iterated in [ReactiveCollections](https://github.com/RACCommunity/ReactiveCollections/). Contributions are welcomed.
136-
137-
#### ReactiveSwift 3.0
138-
ReactiveSwift 3.0 is expected to declare library ABI stability as it adopts generics features arriving in a later Swift 4 release, e.g. conditional conformance. There is no ETA for now.
133+
#### ABI stability release
134+
ReactiveSwift is expected to declare library ABI stability when Swift rolls out resilence support. Until then, ReactiveSwift would incrementally adopt new language features that help move towards to goal. The ETA is Swift 5.
139135

140136
[Core Reactive Primitives]: Documentation/ReactivePrimitives.md
141137
[Basic Operators]: Documentation/BasicOperators.md

0 commit comments

Comments
 (0)