Skip to content

Commit 9a5f53b

Browse files
author
Kaushik Gopal
committed
feat: remove direct Rx 1.X dependencies
1 parent 23f1fbf commit 9a5f53b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,13 @@ dependencies {
3838
compile "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"
3939
compile 'com.mcxiaoke.volley:library:1.0.19'
4040

41-
// ----------- Rx dependencies
41+
// ----------------------------------
42+
// Rx dependencies
4243

43-
compile 'io.reactivex:rxjava:1.1.4'
4444
compile 'io.reactivex.rxjava2:rxjava:2.0.1'
4545

4646
// Because RxAndroid releases are few and far between, it is recommended you also
4747
// explicitly depend on RxJava's latest version for bug fixes and new features.
48-
compile 'io.reactivex:rxandroid:1.2.0'
4948
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
5049

5150
// libs like rxbinding + rxjava-math haven't been ported to RxJava 2.x yet, so this helps
@@ -56,6 +55,7 @@ dependencies {
5655
compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
5756
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
5857

58+
// ----------------------------------
5959

6060
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
6161
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'

app/src/main/java/com/morihacky/android/rxjava/fragments/PlaygroundFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import butterknife.ButterKnife;
1616
import butterknife.OnClick;
1717
import com.morihacky.android.rxjava.R;
18+
import io.reactivex.Observable;
19+
import io.reactivex.android.schedulers.AndroidSchedulers;
20+
import io.reactivex.schedulers.Schedulers;
1821
import java.util.ArrayList;
1922
import java.util.Arrays;
2023
import java.util.List;
2124
import java.util.concurrent.TimeUnit;
22-
import rx.Observable;
23-
import rx.android.schedulers.AndroidSchedulers;
24-
import rx.schedulers.Schedulers;
2525
import timber.log.Timber;
2626

2727
public class PlaygroundFragment
@@ -61,7 +61,7 @@ public void startOperation() {
6161
_logs.clear();
6262
_log("Button Clicked");
6363

64-
Observable.from(Arrays.asList("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"))//
64+
Observable.fromIterable(Arrays.asList("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"))//
6565
.flatMap(s1 -> {
6666

6767
_log(s1 + "start");

0 commit comments

Comments
 (0)