Skip to content

Commit

Permalink
Merge pull request #221 from trello/dlew/prep-2.1.0
Browse files Browse the repository at this point in the history
Prepared release v2.1.0
  • Loading branch information
dlew authored May 27, 2017
2 parents 19c84e3 + fd574f7 commit ec9a75f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 2.1.0 (2017-05-27)

- [#216](https://github.com/trello/RxLifecycle/pull/216): Added support for Android Architecture Components
These can be found in the new rxlifecycle-android-lifecycle and rxlifecycle-android-kotlin artifacts.

- [#219](https://github.com/trello/RxLifecycle/pull/219): Fix potential build issues by making JSR305 compileOnly

## 2.0.1 (2016-11-23)

- [#183](https://github.com/trello/RxLifecycle/pull/183): Fix usage of null in navi module
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,25 +135,25 @@ myObservable
## Installation

```gradle
compile 'com.trello.rxlifecycle2:rxlifecycle:2.0.1'
compile 'com.trello.rxlifecycle2:rxlifecycle:2.1.0'
// If you want to bind to Android-specific lifecycles
compile 'com.trello.rxlifecycle2:rxlifecycle-android:2.0.1'
compile 'com.trello.rxlifecycle2:rxlifecycle-android:2.1.0'
// If you want pre-written Activities and Fragments you can subclass as providers
compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.0.1'
compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
// If you want to use Navi for providers
compile 'com.trello.rxlifecycle2:rxlifecycle-navi:2.0.1'
compile 'com.trello.rxlifecycle2:rxlifecycle-navi:2.1.0'
// If you want to use Android Lifecycle for providers (WARNING: NOT YET RELEASED)
compile 'com.trello.rxlifecycle2:rxlifecycle-android-lifecycle:2.1.0-SNAPSHOT'
// If you want to use Android Lifecycle for providers
compile 'com.trello.rxlifecycle2:rxlifecycle-android-lifecycle:2.1.0'
// If you want to use Kotlin syntax
compile 'com.trello.rxlifecycle2:rxlifecycle-kotlin:2.0.1'
compile 'com.trello.rxlifecycle2:rxlifecycle-kotlin:2.1.0'
// If you want to use Kotlin syntax with Android Lifecycle (WARNING: NOT YET RELEASED)
compile 'com.trello.rxlifecycle2:rxlifecycle-android-kotlin:2.1.0-SNAPSHOT'
// If you want to use Kotlin syntax with Android Lifecycle
compile 'com.trello.rxlifecycle2:rxlifecycle-android-kotlin:2.1.0'
```

## License
Expand Down

0 comments on commit ec9a75f

Please sign in to comment.