Skip to content

Commit d16f20b

Browse files
committed
Prepare RxAndroid 3.0 for RxJava 3.0
1 parent 72da15d commit d16f20b

File tree

6 files changed

+26
-31
lines changed

6 files changed

+26
-31
lines changed

Diff for: README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ allprojects {
2727
}
2828
2929
dependencies {
30-
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0-SNAPSHOT'
30+
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
3131
// Because RxAndroid releases are few and far between, it is recommended you also
3232
// explicitly depend on RxJava's latest version for bug fixes and new features.
3333
// (see https://github.com/ReactiveX/RxJava/releases for latest 3.x.x version)
34-
implementation 'io.reactivex.rxjava3:rxjava:3.0.0-RC2'
34+
implementation 'io.reactivex.rxjava3:rxjava:3.0.0'
3535
```
3636

37-
* RxAndroid: <a href='http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava2%22%20a%3A%22rxandroid%22'><img src='http://img.shields.io/maven-central/v/io.reactivex.rxjava3/rxandroid.svg'></a>
38-
* RxJava: <a href='http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava2%22%20a%3A%22rxjava%22'><img src='http://img.shields.io/maven-central/v/io.reactivex.rxjava3/rxjava.svg'></a>
37+
* RxAndroid: <a href='http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava3%22%20a%3A%22rxandroid%22'><img src='http://img.shields.io/maven-central/v/io.reactivex.rxjava3/rxandroid.svg'></a>
38+
* RxJava: <a href='http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava3%22%20a%3A%22rxjava%22'><img src='http://img.shields.io/maven-central/v/io.reactivex.rxjava3/rxjava.svg'></a>
3939

40-
Additional binaries and dependency information for can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava3%22%20a%3A%22rxandroid%22).
40+
Additional binaries and dependency information for can be found at [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.reactivex.rxjava3%22%20a%3A%22rxandroid%22).
4141

4242

4343
## Build
@@ -67,9 +67,9 @@ result or outcome on the main thread. Using vanilla Android, this would typicall
6767

6868
```java
6969
Observable.just("one", "two", "three", "four", "five")
70-
.subscribeOn(Schedulers.newThread())
71-
.observeOn(AndroidSchedulers.mainThread())
72-
.subscribe(/* an Observer */);
70+
.subscribeOn(Schedulers.newThread())
71+
.observeOn(AndroidSchedulers.mainThread())
72+
.subscribe(/* an Observer */);
7373
```
7474

7575
This will execute the `Observable` on a new thread, and emit results through `onNext` on the main thread.
@@ -83,8 +83,8 @@ communication to an Android message loop, or `Looper`. In order to observe an `O
8383
```java
8484
Looper backgroundLooper = // ...
8585
Observable.just("one", "two", "three", "four", "five")
86-
.observeOn(AndroidSchedulers.from(backgroundLooper))
87-
.subscribe(/* an Observer */)
86+
.observeOn(AndroidSchedulers.from(backgroundLooper))
87+
.subscribe(/* an Observer */)
8888
```
8989

9090
This will execute the Observable on a new thread and emit results through `onNext` on whatever thread is

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ subprojects {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.3'
9+
classpath 'com.android.tools.build:gradle:3.6.0-rc03'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1212
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'

Diff for: gradle/wrapper/gradle-wrapper.jar

3.01 KB
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: gradlew

+12-17
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154154
else
155155
eval `echo args$i`="\"$arg\""
156156
fi
157-
i=$((i+1))
157+
i=`expr $i + 1`
158158
done
159159
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170170
esac
171171
fi
172172

@@ -175,14 +175,9 @@ save () {
175175
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176176
echo " "
177177
}
178-
APP_ARGS=$(save "$@")
178+
APP_ARGS=`save "$@"`
179179

180180
# Collect all arguments for the java command, following the shell quoting and substitution rules
181181
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182182

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188183
exec "$JAVACMD" "$@"

Diff for: rxandroid/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ android {
3636
}
3737

3838
dependencies {
39-
api 'io.reactivex.rxjava3:rxjava:3.0.0-RC7'
39+
api 'io.reactivex.rxjava3:rxjava:3.0.0'
4040

41-
testImplementation 'junit:junit:4.12'
41+
testImplementation 'junit:junit:4.13'
4242
testImplementation 'org.robolectric:robolectric:3.8'
4343
}
4444

0 commit comments

Comments
 (0)