Upgrade to RxJava 3.0.0-RC8

akarnokd · Jan 20, 2020 · d37085f · d37085f
1 parent 49818b7
commit d37085f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -51,7 +51,7 @@ private Flowables() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Publisher<T>... sources) {
-        return orderedMerge(Functions.naturalOrder(), false, Flowable.bufferSize(), sources);
+        return orderedMerge(Comparator.naturalOrder(), false, Flowable.bufferSize(), sources);
     }
 
     /**
@@ -68,7 +68,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Publish
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean delayErrors, Publisher<T>... sources) {
-        return orderedMerge(Functions.naturalOrder(), delayErrors, Flowable.bufferSize(), sources);
+        return orderedMerge(Comparator.naturalOrder(), delayErrors, Flowable.bufferSize(), sources);
     }
 
     /**
@@ -87,7 +87,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(boolean delayErrors, int prefetch, Publisher<T>... sources) {
-        return orderedMerge(Functions.naturalOrder(), delayErrors, prefetch, sources);
+        return orderedMerge(Comparator.naturalOrder(), delayErrors, prefetch, sources);
     }
 
     /**
@@ -221,7 +221,7 @@ public static <T> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sour
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> sources) {
-        return orderedMerge(sources, Functions.naturalOrder(), false, Flowable.bufferSize());
+        return orderedMerge(sources, Comparator.naturalOrder(), false, Flowable.bufferSize());
     }
 
     /**
@@ -237,7 +237,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterabl
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> 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 <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterabl
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Iterable<? extends Publisher<T>> 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
@@ -42,7 +42,7 @@ private ParallelTransformers() {
      * @since 0.17.9
      */
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> source) {
-        return orderedMerge(source, Functions.naturalOrder(), false, Flowable.bufferSize());
+        return orderedMerge(source, Comparator.naturalOrder(), false, Flowable.bufferSize());
     }
 
     /**
@@ -55,7 +55,7 @@ public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(Paralle
      * @since 0.17.9
      */
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> 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 <T extends Comparable<? super T>> Flowable<T> orderedMerge(Paralle
      * @since 0.17.9
      */
     public static <T extends Comparable<? super T>> Flowable<T> orderedMerge(ParallelFlowable<T> source, boolean delayErrors, int prefetch) {
-        return orderedMerge(source, Functions.naturalOrder(), delayErrors, prefetch);
+        return orderedMerge(source, Comparator.naturalOrder(), delayErrors, prefetch);
     }
 
     /**