Skip to content

Commit 4e1568c

Browse files
committed
Merge pull request #16 from abersnaze/upgrade-rxjava
fixing an error when using rxjava 1.0.12.
2 parents 0a2f070 + 4514faa commit 4e1568c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'rxjava-project'
77
apply plugin: 'java'
88

99
dependencies {
10-
compile 'io.reactivex:rxjava:1.0.+'
10+
compile 'io.reactivex:rxjava:1.0.12'
1111
compile 'com.google.guava:guava:+'
1212
testCompile 'junit:junit-dep:4.10'
1313
testCompile 'org.mockito:mockito-core:1.8.5'

src/main/java/rx/observable/ListenableFutureObservable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import rx.Observable;
2222
import rx.Observable.OnSubscribe;
2323
import rx.functions.Action0;
24-
import rx.internal.operators.SingleDelayedProducer;
24+
import rx.internal.producers.SingleDelayedProducer;
2525
import rx.Observer;
2626
import rx.Scheduler;
2727
import rx.Scheduler.Worker;
@@ -76,7 +76,7 @@ public void call(final Subscriber<? super T> subscriber) {
7676
public void run() {
7777
try {
7878
T t = future.get();
79-
sdp.set(t);
79+
sdp.setValue(t);
8080
} catch (Exception e) {
8181
subscriber.onError(e);
8282
}

0 commit comments

Comments
 (0)