From d37085ff78fc371d20be3da45d68532a76275b25 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Mon, 20 Jan 2020 09:06:10 +0100 Subject: [PATCH] Upgrade to RxJava 3.0.0-RC8 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- .../hu/akarnokd/rxjava3/operators/Flowables.java | 12 ++++++------ .../rxjava3/parallel/ParallelTransformers.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8055f691..95160799 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC7" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC8" } ``` diff --git a/build.gradle b/build.gradle index ec2c52e1..c0694f7d 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC8" testCompile group: 'junit', name: 'junit', version: '4.13' diff --git a/gradle.properties b/gradle.properties index f92b7511..2dcb31f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC7 -version=3.0.0-RC7 +VERSION_NAME=3.0.0-RC8 +version=3.0.0-RC8 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java index b8339cb3..52e03d1d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java @@ -51,7 +51,7 @@ private Flowables() { @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), false, Flowable.bufferSize(), sources); + return orderedMerge(Comparator.naturalOrder(), false, Flowable.bufferSize(), sources); } /** @@ -68,7 +68,7 @@ public static > Flowable orderedMerge(Publish @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), delayErrors, Flowable.bufferSize(), sources); + return orderedMerge(Comparator.naturalOrder(), delayErrors, Flowable.bufferSize(), sources); } /** @@ -87,7 +87,7 @@ public static > Flowable orderedMerge(boolean @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, int prefetch, Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), delayErrors, prefetch, sources); + return orderedMerge(Comparator.naturalOrder(), delayErrors, prefetch, sources); } /** @@ -221,7 +221,7 @@ public static Flowable orderedMerge(Iterable> sour @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources) { - return orderedMerge(sources, Functions.naturalOrder(), false, Flowable.bufferSize()); + return orderedMerge(sources, Comparator.naturalOrder(), false, Flowable.bufferSize()); } /** @@ -237,7 +237,7 @@ public static > Flowable orderedMerge(Iterabl @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources, boolean delayErrors) { - return orderedMerge(sources, Functions.naturalOrder(), delayErrors, Flowable.bufferSize()); + return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize()); } /** @@ -255,7 +255,7 @@ public static > Flowable orderedMerge(Iterabl @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources, boolean delayErrors, int prefetch) { - return orderedMerge(sources, Functions.naturalOrder(), delayErrors, prefetch); + return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, prefetch); } /** diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java index 93d8bdec..a9bee1c0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java @@ -42,7 +42,7 @@ private ParallelTransformers() { * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source) { - return orderedMerge(source, Functions.naturalOrder(), false, Flowable.bufferSize()); + return orderedMerge(source, Comparator.naturalOrder(), false, Flowable.bufferSize()); } /** @@ -55,7 +55,7 @@ public static > Flowable orderedMerge(Paralle * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source, boolean delayErrors) { - return orderedMerge(source, Functions.naturalOrder(), delayErrors, Flowable.bufferSize()); + return orderedMerge(source, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize()); } /** @@ -70,7 +70,7 @@ public static > Flowable orderedMerge(Paralle * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source, boolean delayErrors, int prefetch) { - return orderedMerge(source, Functions.naturalOrder(), delayErrors, prefetch); + return orderedMerge(source, Comparator.naturalOrder(), delayErrors, prefetch); } /**