Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to RxJava version to 1.1.0 #8

Open
wants to merge 2 commits into
base: 0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'rxjava-project'
apply plugin: 'java'

dependencies {
compile 'io.reactivex:rxjava:1.0.+'
compile 'io.reactivex:rxjava:1.1.+'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we prefer exact version numbers, at least other sub-projects do it.

testCompile 'junit:junit-dep:4.10'
testCompile 'org.mockito:mockito-core:1.8.5'
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/rx/util/async/Async.java
Original file line number Diff line number Diff line change
Expand Up @@ -2002,7 +2002,10 @@ public static <R> Observable<R> fromAction(Action0 action, R result) {
* subscribes
* @see #start(rx.functions.Func0)
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Async-Operators#wiki-fromcallable">RxJava Wiki: fromCallable()</a>
*
* @deprecated use {@link Observable#fromCallable(Callable)}
*/
@Deprecated
public static <R> Observable<R> fromCallable(Callable<? extends R> callable) {
return fromCallable(callable, Schedulers.computation());
}
Expand Down