Skip to content

Commit d37085f

Browse files
committed
Upgrade to RxJava 3.0.0-RC8
1 parent 49818b7 commit d37085f

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o
1313

1414
```
1515
dependencies {
16-
compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC7"
16+
compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC8"
1717
}
1818
```
1919

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747
signature 'org.codehaus.mojo.signature:java18:1.0@signature'
4848

4949
compile "org.reactivestreams:reactive-streams:1.0.3"
50-
compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7"
50+
compile "io.reactivex.rxjava3:rxjava:3.0.0-RC8"
5151

5252
testCompile group: 'junit', name: 'junit', version: '4.13'
5353

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GROUP=com.github.akarnokd
2-
VERSION_NAME=3.0.0-RC7
3-
version=3.0.0-RC7
2+
VERSION_NAME=3.0.0-RC8
3+
version=3.0.0-RC8
44

55
POM_ARTIFACT_ID=rxjava3-extensions
66
POM_NAME=RxJava 3 extra sources, operators and components

src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private Flowables() {
5151
@SchedulerSupport(SchedulerSupport.NONE)
5252
@SafeVarargs
5353
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Publisher<T>... sources) {
54-
return orderedMerge(Functions.naturalOrder(), false, Flowable.bufferSize(), sources);
54+
return orderedMerge(Comparator.naturalOrder(), false, Flowable.bufferSize(), sources);
5555
}
5656

5757
/**
@@ -68,7 +68,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Publish
6868
@SchedulerSupport(SchedulerSupport.NONE)
6969
@SafeVarargs
7070
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean delayErrors, Publisher<T>... sources) {
71-
return orderedMerge(Functions.naturalOrder(), delayErrors, Flowable.bufferSize(), sources);
71+
return orderedMerge(Comparator.naturalOrder(), delayErrors, Flowable.bufferSize(), sources);
7272
}
7373

7474
/**
@@ -87,7 +87,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean
8787
@SchedulerSupport(SchedulerSupport.NONE)
8888
@SafeVarargs
8989
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean delayErrors, int prefetch, Publisher<T>... sources) {
90-
return orderedMerge(Functions.naturalOrder(), delayErrors, prefetch, sources);
90+
return orderedMerge(Comparator.naturalOrder(), delayErrors, prefetch, sources);
9191
}
9292

9393
/**
@@ -221,7 +221,7 @@ public static <T> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sour
221221
@BackpressureSupport(BackpressureKind.FULL)
222222
@SchedulerSupport(SchedulerSupport.NONE)
223223
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sources) {
224-
return orderedMerge(sources, Functions.naturalOrder(), false, Flowable.bufferSize());
224+
return orderedMerge(sources, Comparator.naturalOrder(), false, Flowable.bufferSize());
225225
}
226226

227227
/**
@@ -237,7 +237,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterabl
237237
@BackpressureSupport(BackpressureKind.FULL)
238238
@SchedulerSupport(SchedulerSupport.NONE)
239239
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sources, boolean delayErrors) {
240-
return orderedMerge(sources, Functions.naturalOrder(), delayErrors, Flowable.bufferSize());
240+
return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize());
241241
}
242242

243243
/**
@@ -255,7 +255,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterabl
255255
@BackpressureSupport(BackpressureKind.FULL)
256256
@SchedulerSupport(SchedulerSupport.NONE)
257257
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sources, boolean delayErrors, int prefetch) {
258-
return orderedMerge(sources, Functions.naturalOrder(), delayErrors, prefetch);
258+
return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, prefetch);
259259
}
260260

261261
/**

src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private ParallelTransformers() {
4242
* @since 0.17.9
4343
*/
4444
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> source) {
45-
return orderedMerge(source, Functions.naturalOrder(), false, Flowable.bufferSize());
45+
return orderedMerge(source, Comparator.naturalOrder(), false, Flowable.bufferSize());
4646
}
4747

4848
/**
@@ -55,7 +55,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Paralle
5555
* @since 0.17.9
5656
*/
5757
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> source, boolean delayErrors) {
58-
return orderedMerge(source, Functions.naturalOrder(), delayErrors, Flowable.bufferSize());
58+
return orderedMerge(source, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize());
5959
}
6060

6161
/**
@@ -70,7 +70,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Paralle
7070
* @since 0.17.9
7171
*/
7272
public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> source, boolean delayErrors, int prefetch) {
73-
return orderedMerge(source, Functions.naturalOrder(), delayErrors, prefetch);
73+
return orderedMerge(source, Comparator.naturalOrder(), delayErrors, prefetch);
7474
}
7575

7676
/**

0 commit comments

Comments
 (0)