From 6a0acbbb410e4d49bad95fefffde6706f268a77a Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Tue, 3 May 2016 00:43:56 -0400
Subject: [PATCH] Prepare version 1.2.0.

---
 CHANGES.md             | 17 +++++++++++++++++
 README.md              |  4 ++--
 gradle.properties      |  2 +-
 rxandroid/build.gradle |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 368ff2f7..00c58eda 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,22 @@
 # RxAndroid Releases #
 
+### Version 1.2.0 - May 4th 2016 ###
+
+ * Rewrite the Android-specific schedulers (main thread or custom) to greatly reduce allocation and
+   performance overhead of scheduling work.
+ * `HandlerScheduler.create` has been deprecated in favor of `AndroidSchedulers.from(Looper)` as
+   a `Looper` is the actual mechanism of scheduling on Android, not `Handler.
+ * Fix: Correct the behavior of `AndroidSchedulers.mainThread()` to only invoke the registered
+   `RxAndroidSchedulersHook` for creating the main thread scheduler and to cache the result instead
+   of invoking it every time. This behvior change eliminates a performance overhead and brings
+   behavior in line with RxJava. If you were relying on the ability to change the main thread
+   scheduler over time (such as for tests), return a delegating scheduler from the hook which allows
+   changing the delegate instance at will.
+ * RxJava dependency now points at v1.1.4.
+ * `RxAndroidPlugins.reset()` is now marked as `@Experimental` to match the RxJava method of the
+   same name and behavior.
+
+
 ### Version 1.1.0 - December 9th 2015 ###
 
  * New: `MainThreadSubscription` utility class runs its `onUnsubscribe` action on the Android main
diff --git a/README.md b/README.md
index 38f0f2bd..1cadc827 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@ Since RxAndroid is part of the RxJava family the communication channels are simi
 # Binaries
 
 ```groovy
-compile 'io.reactivex:rxandroid:1.1.0'
+compile 'io.reactivex:rxandroid:1.2.0'
 // Because RxAndroid releases are few and far between, it is recommended you also
 // explicitly depend on RxJava's latest version for bug fixes and new features.
-compile 'io.reactivex:rxjava:1.1.3'
+compile 'io.reactivex:rxjava:1.1.4'
 ```
 
 * RxAndroid: <a href='http://search.maven.org/#search%7Cga%7C1%7Crxandroid'><img src='http://img.shields.io/maven-central/v/io.reactivex/rxandroid.svg'></a>
diff --git a/gradle.properties b/gradle.properties
index a20989f1..2a49a027 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=io.reactivex
-VERSION_NAME=1.1.1
+VERSION_NAME=1.2.0
 POM_NAME=RxAndroid
 POM_PACKAGING=aar
 POM_DESCRIPTION=RxAndroid
diff --git a/rxandroid/build.gradle b/rxandroid/build.gradle
index 0668887e..465b110a 100644
--- a/rxandroid/build.gradle
+++ b/rxandroid/build.gradle
@@ -47,7 +47,7 @@ repositories {
 }
 
 dependencies {
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'io.reactivex:rxjava:1.1.4'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'