Skip to content

Commit 6543fa6

Browse files
Removed deprecated OnSubscribeFunc
1 parent e55e185 commit 6543fa6

File tree

3 files changed

+22
-59
lines changed

3 files changed

+22
-59
lines changed

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/ImplicitFunctionConversions.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@ object ImplicitFunctionConversions {
4747
}
4848
}
4949

50-
implicit def scalaFunction1ToOnSubscribeFunc[T](f: rx.lang.scala.Observer[T] => Subscription) =
51-
new rx.Observable.OnSubscribeFunc[T] {
52-
def onSubscribe(obs: rx.Observer[_ >: T]): rx.Subscription = {
53-
f(obs)
54-
}
55-
}
56-
5750
implicit def scalaAction1ToOnSubscribe[T](f: Subscriber[T] => Unit) =
5851
new rx.Observable.OnSubscribe[T] {
5952
def call(s: rx.Subscriber[_ >: T]): Unit = {

rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,19 @@
1515
*/
1616
package rx.util.async;
1717

18-
import java.util.concurrent.Callable;
19-
import java.util.concurrent.Future;
20-
import java.util.concurrent.FutureTask;
21-
22-
import rx.Observable;
23-
import rx.Observer;
24-
import rx.Scheduler;
18+
import rx.*;
2519
import rx.Scheduler.Worker;
26-
import rx.Subscriber;
27-
import rx.Subscription;
28-
import rx.functions.Action0;
29-
import rx.functions.Action1;
30-
import rx.functions.Action2;
31-
import rx.functions.Action3;
32-
import rx.functions.Action4;
33-
import rx.functions.Action5;
34-
import rx.functions.Action6;
35-
import rx.functions.Action7;
36-
import rx.functions.Action8;
37-
import rx.functions.Action9;
38-
import rx.functions.ActionN;
39-
import rx.functions.Actions;
40-
import rx.functions.Func0;
41-
import rx.functions.Func1;
42-
import rx.functions.Func2;
43-
import rx.functions.Func3;
44-
import rx.functions.Func4;
45-
import rx.functions.Func5;
46-
import rx.functions.Func6;
47-
import rx.functions.Func7;
48-
import rx.functions.Func8;
49-
import rx.functions.Func9;
50-
import rx.functions.FuncN;
20+
import rx.functions.*;
5121
import rx.schedulers.Schedulers;
5222
import rx.subjects.AsyncSubject;
5323
import rx.subjects.PublishSubject;
5424
import rx.subjects.Subject;
5525
import rx.subscriptions.SerialSubscription;
56-
import rx.util.async.operators.Functionals;
57-
import rx.util.async.operators.OperatorDeferFuture;
58-
import rx.util.async.operators.OperatorForEachFuture;
59-
import rx.util.async.operators.OperatorFromFunctionals;
60-
import rx.util.async.operators.OperatorStartFuture;
26+
import rx.util.async.operators.*;
27+
28+
import java.util.concurrent.Callable;
29+
import java.util.concurrent.Future;
30+
import java.util.concurrent.FutureTask;
6131

6232
/**
6333
* Utility methods to convert functions and actions into asynchronous operations through the Observable/Observer
@@ -95,7 +65,7 @@ public static <T> Observable<T> start(Func0<T> func) {
9565
* Observable. Multiple subscriptions to this Observable observe the same return value.
9666
* <p>
9767
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/start.s.png">
98-
*
68+
* <p>
9969
* @param <T> the result value type
10070
* @param func function to run asynchronously
10171
* @param scheduler Scheduler to run the function on
@@ -111,7 +81,7 @@ public static <T> Observable<T> start(Func0<T> func, Scheduler scheduler) {
11181
* Convert a synchronous action call into an asynchronous function call through an Observable.
11282
* <p>
11383
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/toAsync.an.png">
114-
*
84+
* <p>
11585
* @param action the action to convert
11686
* @return a function that returns an Observable that executes the {@code action} and emits {@code null}
11787
* @see <a href="https://github.com/Netflix/RxJava/wiki/Async-Operators#wiki-toasync-or-asyncaction-or-asyncfunc">RxJava Wiki: toAsync()</a>

settings.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ include 'rxjava-core', \
55
'language-adaptors:rxjava-jruby', \
66
'language-adaptors:rxjava-scala', \
77
'language-adaptors:rxjava-kotlin', \
8-
'rxjava-contrib:rxjava-swing', \
8+
'rxjava-contrib:rxjava-swing'
99
//'rxjava-contrib:rxjava-javafx', \
10-
'rxjava-contrib:rxjava-ios', \
11-
'rxjava-contrib:rxjava-android', \
12-
'rxjava-contrib:rxjava-android-samples-build-wrapper', \
13-
'rxjava-contrib:rxjava-apache-http', \
14-
'rxjava-contrib:rxjava-joins', \
15-
'rxjava-contrib:rxjava-string', \
16-
'rxjava-contrib:rxjava-math', \
17-
'rxjava-contrib:rxjava-debug', \
18-
'rxjava-contrib:rxjava-async-util', \
19-
'rxjava-contrib:rxjava-computation-expressions',\
20-
'rxjava-contrib:rxjava-scalaz', \
21-
'rxjava-contrib:rxjava-quasar'
10+
//'rxjava-contrib:rxjava-ios', \
11+
//'rxjava-contrib:rxjava-android', \
12+
//'rxjava-contrib:rxjava-android-samples-build-wrapper', \
13+
//'rxjava-contrib:rxjava-apache-http', \
14+
//'rxjava-contrib:rxjava-joins'
15+
//'rxjava-contrib:rxjava-string', \
16+
//'rxjava-contrib:rxjava-math', \
17+
//'rxjava-contrib:rxjava-debug'
18+
//'rxjava-contrib:rxjava-async-util'
19+
//'rxjava-contrib:rxjava-computation-expressions'
20+
//'rxjava-contrib:rxjava-scalaz', \
21+
//'rxjava-contrib:rxjava-quasar'

0 commit comments

Comments
 (0)