Skip to content

Commit 08327f2

Browse files
authored
Feat/upgrade rxjava3 (#14)
* Upgrade rxjava to 3.x, also bump doris-android version * Bump doris-android to 3.9.2
1 parent 2c3ef8c commit 08327f2

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '7.2.0' apply false
4-
id 'com.android.library' version '7.2.0' apply false
3+
id 'com.android.application' version '7.4.2' apply false
4+
id 'com.android.library' version '7.4.2' apply false
55
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
66
}
77

chromecast/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
android {
66
namespace 'com.dice.chromecast'
7-
compileSdk 33
7+
compileSdk 34
88

99
defaultConfig {
1010
applicationId "com.dice.chromecast"
@@ -34,6 +34,5 @@ dependencies {
3434
implementation "com.google.android.material:material:$androidxMaterialVersion"
3535
implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion"
3636

37-
implementation 'com.google.android.gms:play-services-cast-framework:21.2.0'
38-
implementation 'com.google.android.material:material:1.7.0'
37+
implementation 'com.google.android.gms:play-services-cast-framework:21.3.0'
3938
}

csai/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace 'com.dice.doris.csai'
8-
compileSdk 33
8+
compileSdk 34
99

1010
defaultConfig {
1111
applicationId "com.dice.doris.csai"

d2g/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
}
44

55
android {
6-
compileSdk 33
6+
compileSdk 34
77

88
defaultConfig {
99
applicationId "com.dice.doris.d2g"
1010
minSdk 23
11-
targetSdk 32
11+
targetSdk 33
1212
versionCode 1
1313
versionName "1.0"
1414

@@ -41,6 +41,6 @@ dependencies {
4141
}
4242

4343
// RxJava
44-
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
45-
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
44+
implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
45+
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
4646
}

d2g/src/main/java/com/dice/doris/example/MainActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import java.util.List;
3131
import java.util.Locale;
3232

33-
import io.reactivex.Observable;
34-
import io.reactivex.android.schedulers.AndroidSchedulers;
35-
import io.reactivex.disposables.CompositeDisposable;
36-
import io.reactivex.schedulers.Schedulers;
33+
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
34+
import io.reactivex.rxjava3.core.Observable;
35+
import io.reactivex.rxjava3.disposables.CompositeDisposable;
36+
import io.reactivex.rxjava3.schedulers.Schedulers;
3737

3838
public class MainActivity extends FragmentActivity {
3939

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext{
2-
dorisVersion = '3.6.10'
2+
dorisVersion = '3.9.2'
33

44
androidxAppCompatVersion = '1.6.1'
55
androidxMaterialVersion = '1.9.0'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Mar 07 15:50:17 CET 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

video/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
android {
66
namespace 'com.dice.doris.video'
7-
compileSdk 33
7+
compileSdk 34
88

99
defaultConfig {
1010
applicationId "com.dice.doris.video"

0 commit comments

Comments
 (0)