Skip to content

Commit 3e0125e

Browse files
AndroidStudentClubAndroidStudentClub
authored
Merge pull request #1 from AndroidStudentClub/feature/migration-to-rxjava3
Примеры проекта переведены на RxJava3.0
2 parents d4d30ba + 196a7fd commit 3e0125e

22 files changed

Lines changed: 44 additions & 53 deletions

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ dependencies {
3636
testImplementation 'junit:junit:4.12'
3737
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3838
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
39-
testImplementation "io.reactivex.rxjava2:rxandroid:2.1.1"
40-
implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
39+
testImplementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
40+
implementation 'io.reactivex.rxjava3:rxjava:3.0.0'
4141
}

‎app/src/test/java/ru/androidschool/rxjava/CreateExample.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import org.junit.Test;
44

5-
import io.reactivex.Observable;
6-
import io.reactivex.ObservableEmitter;
7-
import io.reactivex.ObservableOnSubscribe;
8-
import io.reactivex.Observer;
9-
import io.reactivex.Single;
10-
import io.reactivex.disposables.Disposable;
5+
import io.reactivex.rxjava3.core.Observable;
6+
import io.reactivex.rxjava3.core.ObservableEmitter;
7+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
8+
import io.reactivex.rxjava3.core.Observer;
9+
import io.reactivex.rxjava3.disposables.Disposable;
1110

1211
public class CreateExample {
1312

@@ -37,7 +36,6 @@ public void onSubscribe(Disposable d) {
3736

3837
@Override
3938
public void onNext(String s) {
40-
4139
System.out.println("onNext: " + s);
4240
}
4341

‎app/src/test/java/ru/androidschool/rxjava/CreateObservable.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package ru.androidschool.rxjava;
22

33
import org.junit.Test;
4-
54
import java.util.concurrent.Callable;
6-
7-
import io.reactivex.Observable;
5+
import io.reactivex.rxjava3.core.Observable;
86

97
public class CreateObservable {
108

‎app/src/test/java/ru/androidschool/rxjava/JustVsFromCallble.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package ru.androidschool.rxjava;
22

33
import org.junit.Test;
4-
54
import java.util.concurrent.Callable;
65

7-
import io.reactivex.Observable;
6+
import io.reactivex.rxjava3.core.Observable;
87

98
public class JustVsFromCallble {
109

‎app/src/test/java/ru/androidschool/rxjava/kotlin/codelab/CodeLab.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ru.androidschool.rxjava.kotlin.codelab
22

3-
import io.reactivex.Observable
3+
import io.reactivex.rxjava3.core.Observable
44
import org.junit.Test
55

66
class CodeLab {

‎app/src/test/java/ru/androidschool/rxjava/kotlin/create/CreateExample.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package ru.androidschool.rxjava.kotlin.create
22

3-
import io.reactivex.Observable
4-
import io.reactivex.ObservableOnSubscribe
5-
import io.reactivex.Observer
6-
import io.reactivex.disposables.Disposable
3+
4+
import io.reactivex.rxjava3.core.Observable
5+
import io.reactivex.rxjava3.core.ObservableOnSubscribe
6+
import io.reactivex.rxjava3.core.Observer
7+
import io.reactivex.rxjava3.disposables.Disposable
78
import org.junit.Test
89

910
class CreateExample {

‎app/src/test/java/ru/androidschool/rxjava/kotlin/create/CreateObservable.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package ru.androidschool.rxjava.kotlin.create
22

3-
import io.reactivex.Observable
4-
import io.reactivex.Single
3+
import io.reactivex.rxjava3.core.Observable
4+
import io.reactivex.rxjava3.core.Single
55
import org.junit.Test
66

7-
import org.junit.Assert.*
8-
import java.util.concurrent.Callable
97

108
class CreateObservable {
119

‎app/src/test/java/ru/androidschool/rxjava/kotlin/create/DisposableExample.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ru.androidschool.rxjava.kotlin.create
22

3-
import io.reactivex.Observable
4-
import io.reactivex.disposables.CompositeDisposable
5-
import io.reactivex.disposables.Disposable
3+
import io.reactivex.rxjava3.core.Observable
4+
import io.reactivex.rxjava3.disposables.CompositeDisposable
5+
import io.reactivex.rxjava3.disposables.Disposable
66
import org.junit.Test
77

88
class DisposableExample {

‎app/src/test/java/ru/androidschool/rxjava/kotlin/create/JustVsFromCallable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ru.androidschool.rxjava.kotlin.create
22

3-
import io.reactivex.Observable
3+
import io.reactivex.rxjava3.core.Observable
44
import org.junit.Test
55

66
class JustVsFromCallble {

‎app/src/test/java/ru/androidschool/rxjava/kotlin/error_handling/ErrorHandlingDemo.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ru.androidschool.rxjava.kotlin.error_handling
22

3-
import io.reactivex.Observable
4-
import io.reactivex.observers.TestObserver
3+
import io.reactivex.rxjava3.core.Observable
4+
import io.reactivex.rxjava3.observers.TestObserver
55
import org.junit.Test
66

77
class ErrorHandlingDemo {
@@ -38,11 +38,10 @@ class ErrorHandlingDemo {
3838

3939
val source = Observable.just(5, 2, 1, 0, 3, 2, 8)
4040
.map { i -> 10 / i }
41-
.onErrorResumeNext(Observable.just(100, 200, 300))
41+
.onErrorResumeWith(Observable.just(100, 200, 300))
4242

4343
source.subscribe(testObserver)
4444

45-
4645
testObserver.assertNoErrors()
4746
testObserver.assertComplete()
4847
testObserver.assertValueCount(6)

0 commit comments

Comments
 (0)