Skip to content

Commit

Permalink
Merge pull request #181 from trello/dlew/prep-2.0
Browse files Browse the repository at this point in the history
Prepare 2.0 release
  • Loading branch information
dlew authored Nov 21, 2016
2 parents 424da0d + 690c59f commit ab4f41d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 2.0 (*unreleased*)
## 2.0 (2016-11-21)

This major revision was made to support RxJava 2. RxLifecycle 2.0 lives in a new namespace and package
names so that it can work side-by-side with RxLifecycle 1.0 (while transitioning).
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,20 @@ myObservable

## Installation

RxLifecycle2 is currently only on OSS snapshot repository (https://oss.sonatype.org/content/repositories/snapshots/).

```gradle
compile 'com.trello.rxlifecycle2:rxlifecycle:2.0-SNAPSHOT'
compile 'com.trello.rxlifecycle2:rxlifecycle:2.0'
// If you want to bind to Android-specific lifecycles
compile 'com.trello.rxlifecycle2:rxlifecycle-android:2.0-SNAPSHOT'
compile 'com.trello.rxlifecycle2:rxlifecycle-android:2.0'
// If you want pre-written Activities and Fragments you can subclass as providers
compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.0-SNAPSHOT'
compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.0'
// If you want to use Navi for providers
compile 'com.trello.rxlifecycle2:rxlifecycle-navi:2.0-SNAPSHOT'
compile 'com.trello.rxlifecycle2:rxlifecycle-navi:2.0'
// If you want to use Kotlin syntax
compile 'com.trello.rxlifecycle2:rxlifecycle-kotlin:2.0-SNAPSHOT'
compile 'com.trello.rxlifecycle2:rxlifecycle-kotlin:2.0'
```

## License
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ ext {
targetCompatibilityVersion = JavaVersion.VERSION_1_7

// Define all dependencies in the base project, to unify & make it easy to update
rxJava = 'io.reactivex.rxjava2:rxjava:2.0.0'
rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.0'
navi = 'com.trello.navi2:navi:2.0-SNAPSHOT'
rxJava = 'io.reactivex.rxjava2:rxjava:2.0.1'
rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.1'
navi = 'com.trello.navi2:navi:2.0'
kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$verKotlin"
appCompat = 'com.android.support:appcompat-v7:25.0.0'
supportAnnotations = 'com.android.support:support-annotations:25.0.0'
Expand Down
2 changes: 0 additions & 2 deletions rxlifecycle-navi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ android {

repositories {
mavenCentral()

maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

dependencies {
Expand Down

0 comments on commit ab4f41d

Please sign in to comment.