Upgrade to rxJava2 last version 2.0.0

happylinhdn · Nov 8, 2016 · 526135f · 526135f
1 parent 5c31259
commit 526135f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 97 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
@@ -21,7 +21,7 @@ ext {
     targetSdkVersion = compileSdkVersion
     buildToolsVersion = '24.0.3'
 
-    rxJava = 'io.reactivex.rxjava2:rxjava:2.0.0-RC4'
+    rxJava = 'io.reactivex.rxjava2:rxjava:2.0.0'
     appCompat = 'com.android.support:appcompat-v7:24.1.1'
     junit = 'junit:junit:4.12'
     mockito = 'org.mockito:mockito-core:1.10.19'

diff --git a/lib/src/main/java/com/tbruyelle/rxpermissions2/RxPermissions.java b/lib/src/main/java/com/tbruyelle/rxpermissions2/RxPermissions.java
@@ -78,7 +78,7 @@ private void log(String message) {
     public <T> ObservableTransformer<T, Boolean> ensure(final String... permissions) {
         return new ObservableTransformer<T, Boolean>() {
             @Override
-            public ObservableSource<Boolean> apply(Observable<T> o) throws Exception {
+            public ObservableSource<Boolean> apply(Observable<T> o) {
                 return request(o, permissions)
                         // Transform Observable<Permission> to Observable<Boolean>
                         .buffer(permissions.length)
@@ -114,7 +114,7 @@ public ObservableSource<Boolean> apply(List<Permission> permissions) throws Exce
     public <T> ObservableTransformer<T, Permission> ensureEach(final String... permissions) {
         return new ObservableTransformer<T, Permission>() {
             @Override
-            public ObservableSource<Permission> apply(Observable<T> o) throws Exception {
+            public ObservableSource<Permission> apply(Observable<T> o) {
                 return request(o, permissions);
             }
         };

diff --git a/sample/src/main/java/com/tbruyelle/rxpermissions/sample/MainActivity.java b/sample/src/main/java/com/tbruyelle/rxpermissions/sample/MainActivity.java