Skip to content

Commit b36ec3f

Browse files
d4rkend4rken
committed
Upgrade to RxJava3
1 parent f8bc6ca commit b36ec3f

File tree

29 files changed

+303
-300
lines changed

29 files changed

+303
-300
lines changed

‎build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
def versionMajor = 1
2+
def versionMajor = 3
33
def versionMinor = 0
4-
def versionPatch = 9
4+
def versionPatch = 0
55

66
ext.versions = [
77
'versionCode' : versionMajor * 10000 + versionMinor * 100 + versionPatch,
88
'versionName' : "${versionMajor}.${versionMinor}.${versionPatch}",
9-
'minSdk' : 16,
9+
'minSdk' : 21,
1010
'targetSdk' : 28,
1111
'compileSdk' : 28,
1212
'sourceCompatibility': JavaVersion.VERSION_1_8,
@@ -52,8 +52,8 @@ buildscript {
5252
],
5353
androidPlugin: 'com.android.tools.build:gradle:3.1.2',
5454
timber : "com.jakewharton.timber:timber:4.7.1",
55-
rxJava : "io.reactivex.rxjava2:rxjava:2.2.4",
56-
rxJavaReplay : "com.jakewharton.rx2:replaying-share:2.1.0",
55+
rxJava : "io.reactivex.rxjava3:rxjava:3.0.4",
56+
rxJavaReplay : "com.jakewharton.rx3:replaying-share:3.0.0",
5757
jUnit : "junit:junit:4.12",
5858
mockito : "org.mockito:mockito-core:2.8.9",
5959
awaitility : "org.awaitility:awaitility:3.0.0",

‎core/src/main/java/eu/darken/rxshell/cmd/Cmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import java.util.UUID;
1111

1212
import eu.darken.rxshell.process.RxProcess;
13-
import io.reactivex.Single;
14-
import io.reactivex.processors.FlowableProcessor;
13+
import io.reactivex.rxjava3.core.Single;
14+
import io.reactivex.rxjava3.processors.FlowableProcessor;
1515

1616
public class Cmd {
1717
public static class ExitCode extends RxProcess.ExitCode {

‎core/src/main/java/eu/darken/rxshell/cmd/CmdProcessor.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
import eu.darken.rxshell.extra.RXSDebug;
1414
import eu.darken.rxshell.shell.RxShell;
15-
import io.reactivex.Observable;
16-
import io.reactivex.ObservableOnSubscribe;
17-
import io.reactivex.Observer;
18-
import io.reactivex.Single;
19-
import io.reactivex.SingleEmitter;
20-
import io.reactivex.SingleOnSubscribe;
21-
import io.reactivex.disposables.Disposable;
22-
import io.reactivex.schedulers.Schedulers;
23-
import io.reactivex.subjects.BehaviorSubject;
15+
import io.reactivex.rxjava3.core.Observable;
16+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
17+
import io.reactivex.rxjava3.core.Observer;
18+
import io.reactivex.rxjava3.core.Single;
19+
import io.reactivex.rxjava3.core.SingleEmitter;
20+
import io.reactivex.rxjava3.core.SingleOnSubscribe;
21+
import io.reactivex.rxjava3.disposables.Disposable;
22+
import io.reactivex.rxjava3.schedulers.Schedulers;
23+
import io.reactivex.rxjava3.subjects.BehaviorSubject;
2424
import timber.log.Timber;
2525

2626
public class CmdProcessor {

‎core/src/main/java/eu/darken/rxshell/cmd/ErrorHarvester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
import io.reactivex.Flowable;
11+
import io.reactivex.rxjava3.core.Flowable;
1212

1313

1414
public class ErrorHarvester extends Harvester<Harvester.Crop> {

‎core/src/main/java/eu/darken/rxshell/cmd/Harvester.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import java.util.List;
1111

1212
import eu.darken.rxshell.extra.RXSDebug;
13-
import io.reactivex.Flowable;
14-
import io.reactivex.FlowableTransformer;
15-
import io.reactivex.internal.subscriptions.SubscriptionHelper;
16-
import io.reactivex.processors.FlowableProcessor;
13+
import io.reactivex.rxjava3.core.Flowable;
14+
import io.reactivex.rxjava3.core.FlowableTransformer;
15+
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
16+
import io.reactivex.rxjava3.processors.FlowableProcessor;
1717
import timber.log.Timber;
1818

1919
public abstract class Harvester<T extends Harvester.Crop> extends Flowable<T> implements FlowableTransformer<String, T> {

‎core/src/main/java/eu/darken/rxshell/cmd/OutputHarvester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
import io.reactivex.Flowable;
11+
import io.reactivex.rxjava3.core.Flowable;
1212
import timber.log.Timber;
1313

1414
public class OutputHarvester extends Harvester<OutputHarvester.Crop> {

‎core/src/main/java/eu/darken/rxshell/cmd/RxCmdShell.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import eu.darken.rxshell.process.RxProcess;
1919
import eu.darken.rxshell.process.UserKiller;
2020
import eu.darken.rxshell.shell.RxShell;
21-
import io.reactivex.Completable;
22-
import io.reactivex.Single;
23-
import io.reactivex.SingleObserver;
24-
import io.reactivex.SingleOnSubscribe;
25-
import io.reactivex.disposables.Disposable;
26-
import io.reactivex.schedulers.Schedulers;
21+
import io.reactivex.rxjava3.core.Completable;
22+
import io.reactivex.rxjava3.core.Single;
23+
import io.reactivex.rxjava3.core.SingleObserver;
24+
import io.reactivex.rxjava3.core.SingleOnSubscribe;
25+
import io.reactivex.rxjava3.disposables.Disposable;
26+
import io.reactivex.rxjava3.schedulers.Schedulers;
2727
import timber.log.Timber;
2828

2929

‎core/src/main/java/eu/darken/rxshell/process/RootKiller.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
import eu.darken.rxshell.extra.RXSDebug;
1616
import eu.darken.rxshell.shell.LineReader;
17-
import io.reactivex.Observable;
18-
import io.reactivex.ObservableOnSubscribe;
19-
import io.reactivex.Single;
20-
import io.reactivex.schedulers.Schedulers;
17+
import io.reactivex.rxjava3.core.Observable;
18+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
19+
import io.reactivex.rxjava3.core.Single;
20+
import io.reactivex.rxjava3.schedulers.Schedulers;
2121
import timber.log.Timber;
2222

2323
public class RootKiller implements ProcessKiller {

‎core/src/main/java/eu/darken/rxshell/process/RxProcess.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
import eu.darken.rxshell.extra.ApiWrap;
1010
import eu.darken.rxshell.extra.RXSDebug;
11-
import io.reactivex.Completable;
12-
import io.reactivex.Observable;
13-
import io.reactivex.Observer;
14-
import io.reactivex.Single;
15-
import io.reactivex.SingleEmitter;
16-
import io.reactivex.SingleOnSubscribe;
17-
import io.reactivex.disposables.Disposable;
18-
import io.reactivex.functions.Action;
19-
import io.reactivex.schedulers.Schedulers;
11+
import io.reactivex.rxjava3.core.Completable;
12+
import io.reactivex.rxjava3.core.Observable;
13+
import io.reactivex.rxjava3.core.Observer;
14+
import io.reactivex.rxjava3.core.Single;
15+
import io.reactivex.rxjava3.core.SingleEmitter;
16+
import io.reactivex.rxjava3.core.SingleOnSubscribe;
17+
import io.reactivex.rxjava3.disposables.Disposable;
18+
import io.reactivex.rxjava3.functions.Action;
19+
import io.reactivex.rxjava3.schedulers.Schedulers;
2020
import timber.log.Timber;
2121

2222

‎core/src/main/java/eu/darken/rxshell/shell/RxShell.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
import java.io.InputStream;
66
import java.io.InputStreamReader;
77
import java.io.OutputStreamWriter;
8+
import java.nio.charset.StandardCharsets;
89

910
import eu.darken.rxshell.extra.RXSDebug;
1011
import eu.darken.rxshell.process.RxProcess;
11-
import io.reactivex.BackpressureStrategy;
12-
import io.reactivex.Completable;
13-
import io.reactivex.Flowable;
14-
import io.reactivex.FlowableEmitter;
15-
import io.reactivex.Single;
16-
import io.reactivex.disposables.Disposable;
17-
import io.reactivex.schedulers.Schedulers;
12+
import io.reactivex.rxjava3.core.BackpressureStrategy;
13+
import io.reactivex.rxjava3.core.Completable;
14+
import io.reactivex.rxjava3.core.Flowable;
15+
import io.reactivex.rxjava3.core.FlowableEmitter;
16+
import io.reactivex.rxjava3.core.Single;
17+
import io.reactivex.rxjava3.disposables.Disposable;
18+
import io.reactivex.rxjava3.schedulers.Schedulers;
1819
import timber.log.Timber;
1920

2021
public class RxShell {
@@ -31,7 +32,7 @@ public synchronized Single<Session> open() {
3132
if (session == null) {
3233
session = rxProcess.open()
3334
.map(session -> {
34-
OutputStreamWriter writer = new OutputStreamWriter(session.input(), "UTF-8");
35+
OutputStreamWriter writer = new OutputStreamWriter(session.input(), StandardCharsets.UTF_8);
3536
return new Session(session, writer);
3637
})
3738
.subscribeOn(Schedulers.io())
@@ -165,7 +166,7 @@ public String toString() {
165166
static Flowable<String> makeLineStream(InputStream stream, String tag) {
166167
return Flowable
167168
.create((FlowableEmitter<String> emitter) -> {
168-
final InputStreamReader inputStreamReader = new InputStreamReader(stream, "UTF-8");
169+
final InputStreamReader inputStreamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
169170
final BufferedReader reader = new BufferedReader(inputStreamReader);
170171
emitter.setCancellable(() -> {
171172
try {

0 commit comments

Comments
 (0)