Skip to content

Commit

Permalink
2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andersio committed Jul 21, 2017
1 parent f83c230 commit 6147571
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# master
*Please add new entries at the top.*

# 2.0.0
# 2.0.0-rc.3
1. `Lifetime.+=` which ties a `Disposable` to a `Lifetime`, is now part of the public API and is no longer deprecated.

Expand Down
21 changes: 3 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

☕️ [Looking for Cocoa extensions?][ReactiveCocoa]
🎉 [Getting Started](#getting-started)
⚠️ [Still using Swift 2.x?][]


🚄 [Release Roadmap](#release-roadmap)
## What is ReactiveSwift?
Expand Down Expand Up @@ -70,7 +68,7 @@ If you use [Carthage][] to manage your dependencies, simply add
ReactiveSwift to your `Cartfile`:

```
github "ReactiveCocoa/ReactiveSwift" ~> 1.1
github "ReactiveCocoa/ReactiveSwift" ~> 2.0
```

If you use Carthage to build your dependencies, make sure you have added `ReactiveSwift.framework`, and `Result.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
Expand All @@ -81,7 +79,7 @@ If you use [CocoaPods][] to manage your dependencies, simply add
ReactiveSwift to your `Podfile`:

```
pod 'ReactiveSwift', '~> 1.1'
pod 'ReactiveSwift', '~> 2.0'
```

#### Swift Package Manager
Expand All @@ -90,7 +88,7 @@ If you use Swift Package Manager, simply add ReactiveSwift as a dependency
of your package in `Package.swift`:

```
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1)
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2)
```

#### Git submodule
Expand Down Expand Up @@ -127,19 +125,6 @@ If you need any help, please visit our [GitHub issues][] or [Stack Overflow][].
## Release Roadmap
**Current Stable Release:**<br />[![GitHub release](https://img.shields.io/github/release/ReactiveCocoa/ReactiveSwift.svg)](https://github.com/ReactiveCocoa/ReactiveSwift/releases)

### In Development
#### ReactiveSwift 2.0
It targets Swift 3.1. The estimated schedule is WWDC 2017.

The primary goal of ReactiveSwift 2.0 is to take advantage of **concrete same-type requirements** introduced in Swift 3.1. As a result:

1. A few single-implementation protocols were removed; and
2. `Signal` and `SignalProducer` operators were moved from the protocols to the concrete types.

These changes are source breaking, but are automatically or trivially migratable.

ReactiveSwift 2.0 has continued the work in polishing the APIs, preparing for the eventual API freeze for library resilience.

#### Swift 3.2 and Swift 4.0 compatibility
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.

Expand Down
2 changes: 1 addition & 1 deletion ReactiveSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "ReactiveSwift"
# Version goes here and will be used to access the git tag later on, once we have a first release.
s.version = "2.0.0-rc.3"
s.version = "2.0.0"
s.summary = "Streams of values over time"
s.description = <<-DESC
ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.
Expand Down

0 comments on commit 6147571

Please sign in to comment.