From 48599f1b6a9efc2c5daf00cddfd0bf23f44512d6 Mon Sep 17 00:00:00 2001 From: Jonas Adler Date: Wed, 9 Dec 2015 16:38:24 +0100 Subject: [PATCH 1/2] bump to RxJava version to 1.1.+ // deprecate Async#fromCallable(Callable) in favor of Observable#fromCallable(Callable) --- build.gradle | 2 +- src/main/java/rx/util/async/Async.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 72c35e6..a2b6dd7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'rxjava-project' apply plugin: 'java' dependencies { - compile 'io.reactivex:rxjava:1.0.+' + compile 'io.reactivex:rxjava:1.1.+' testCompile 'junit:junit-dep:4.10' testCompile 'org.mockito:mockito-core:1.8.5' } diff --git a/src/main/java/rx/util/async/Async.java b/src/main/java/rx/util/async/Async.java index 2dafbdd..4eb7497 100644 --- a/src/main/java/rx/util/async/Async.java +++ b/src/main/java/rx/util/async/Async.java @@ -2002,7 +2002,10 @@ public static Observable fromAction(Action0 action, R result) { * subscribes * @see #start(rx.functions.Func0) * @see RxJava Wiki: fromCallable() + * + * @deprecated use {@link Observable#fromCallable(Callable)} */ + @Deprecated public static Observable fromCallable(Callable callable) { return fromCallable(callable, Schedulers.computation()); } From dcb23ae9768a94b9cacef87f52ed519c81906115 Mon Sep 17 00:00:00 2001 From: Jonas Adler Date: Wed, 9 Dec 2015 17:37:18 +0100 Subject: [PATCH 2/2] use exact version number of RxJava --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a2b6dd7..6f82fce 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'rxjava-project' apply plugin: 'java' dependencies { - compile 'io.reactivex:rxjava:1.1.+' + compile 'io.reactivex:rxjava:1.1.0' testCompile 'junit:junit-dep:4.10' testCompile 'org.mockito:mockito-core:1.8.5' }