Skip to content

Commit 57d3d5e

Browse files
committed
Upgrade to Quasar 0.6.0
1 parent cb6333e commit 57d3d5e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

rxjava-contrib/rxjava-quasar/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ repositories {
1515

1616
dependencies {
1717
compile project(':rxjava-core')
18-
compile 'co.paralleluniverse:quasar-core:0.5.0'
19-
quasar 'co.paralleluniverse:quasar-core:0.5.0'
18+
compile 'co.paralleluniverse:quasar-core:0.6.0'
19+
quasar 'co.paralleluniverse:quasar-core:0.6.0'
2020
testCompile project(":rxjava-core").sourceSets.test.output
2121
testCompile 'junit:junit-dep:4.10'
2222
testCompile 'org.mockito:mockito-core:1.8.5'

rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/ChannelObservable.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,16 @@ public static <T> T get(final Observable<T> o, long timeout, TimeUnit unit) thro
178178
return new AsyncObservable<T>(o).run(timeout, unit);
179179
}
180180

181-
private static class AsyncObservable<T> extends FiberAsync<T, Void, ExecutionException> implements Observer<T> {
181+
private static class AsyncObservable<T> extends FiberAsync<T, ExecutionException> implements Observer<T> {
182182
private final Observable<T> o;
183183

184184
public AsyncObservable(Observable<T> o) {
185185
this.o = o;
186186
}
187187

188188
@Override
189-
protected Void requestAsync() {
189+
protected void requestAsync() {
190190
o.subscribe(this);
191-
return null;
192191
}
193192

194193
@Override

0 commit comments

Comments
 (0)