Merge pull request #143 from lrytz/2.13.x-rc2

adapt to changes for 2.13.0-RC2

.travis.yml

@@ -7,7 +7,7 @@ jdk:
   - openjdk11
 
 scala:
-  - 2.13.0-RC1
+  - 2.13.0-RC2
 
 env:
   global:

build.sbt

@@ -1,6 +1,6 @@
 import ScalaModulePlugin._
 
-crossScalaVersions in ThisBuild := List("2.13.0-RC1")
+crossScalaVersions in ThisBuild := List("2.13.0-RC2")
 
 val disableDocs =
   sys.props("nodocs") == "true" ||

src/main/java/scala/compat/java8/ScalaStreamSupport.java

@@ -15,7 +15,7 @@
 import java.util.stream.*;
 
 import scala.collection.*;
-import scala.jdk.StreamConverters;
+import scala.jdk.javaapi.StreamConverters;
 
 /**
  * This class contains static utility methods for creating Java Streams from Scala Collections, similar
@@ -142,7 +142,7 @@ public static <V> Stream<V> streamAccumulatedValues(Map<?, V> coll) {
      * @return     A DoubleStream view of the collection which, by default, executes sequentially.
      */
     public static DoubleStream doubleStream(IterableOnce<Double> coll) {
-        return StreamConverters.asJavaSeqDoubleStream((IterableOnce<Object>)(Object)coll);
+        return StreamConverters.asJavaSeqDoubleStream(coll);
     }
 
     /**
@@ -183,7 +183,7 @@ public static DoubleStream doubleStreamValues(Map<?, Double> coll) {
      * @return     A DoubleStream view of the collection which, by default, executes sequentially.
      */
     public static DoubleStream doubleStreamAccumulated(IterableOnce<Double> coll) {
-        return StreamConverters.asJavaSeqDoubleStream(scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
+        return StreamConverters.asJavaSeqDoubleStream((IterableOnce<Double>)(Object)scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
     }
 
     /**
@@ -196,7 +196,7 @@ public static DoubleStream doubleStreamAccumulated(IterableOnce<Double> coll) {
      * @return     A DoubleStream view of the collection which, by default, executes sequentially.
      */
     public static DoubleStream doubleStreamAccumulatedKeys(Map<Double, ?> coll) {
-        return StreamConverters.asJavaSeqDoubleStream(scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
+        return StreamConverters.asJavaSeqDoubleStream((IterableOnce<Double>)(Object)scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
     }
 
     /**
@@ -209,7 +209,7 @@ public static DoubleStream doubleStreamAccumulatedKeys(Map<Double, ?> coll) {
      * @return     A DoubleStream view of the collection which, by default, executes sequentially.
      */
     public static DoubleStream doubleStreamAccumulatedValues(Map<?, Double> coll) {
-        return StreamConverters.asJavaSeqDoubleStream(scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
+        return StreamConverters.asJavaSeqDoubleStream((IterableOnce<Double>)(Object)scala.jdk.DoubleAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
     }
 
     /////////////////
@@ -227,7 +227,7 @@ public static DoubleStream doubleStreamAccumulatedValues(Map<?, Double> coll) {
      * @return     A IntStream view of the collection which, by default, executes sequentially.
      */
     public static IntStream intStream(IterableOnce<Integer> coll) {
-        return StreamConverters.asJavaSeqIntStream((IterableOnce<Object>)(Object)coll);
+        return StreamConverters.asJavaSeqIntStream(coll);
     }
 
     /**
@@ -268,7 +268,7 @@ public static IntStream intStreamValues(Map<?, Integer> coll) {
      * @return     A IntStream view of the collection which, by default, executes sequentially.
      */
     public static IntStream intStreamAccumulated(IterableOnce<Integer> coll) {
-        return StreamConverters.asJavaSeqIntStream(scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
+        return StreamConverters.asJavaSeqIntStream((IterableOnce<Integer>)(Object)scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
     }
 
     /**
@@ -281,7 +281,7 @@ public static IntStream intStreamAccumulated(IterableOnce<Integer> coll) {
      * @return     A IntStream view of the collection which, by default, executes sequentially.
      */
     public static IntStream intStreamAccumulatedKeys(Map<Integer, ?> coll) {
-        return StreamConverters.asJavaSeqIntStream(scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
+        return StreamConverters.asJavaSeqIntStream((IterableOnce<Integer>)(Object)scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
     }
 
     /**
@@ -294,7 +294,7 @@ public static IntStream intStreamAccumulatedKeys(Map<Integer, ?> coll) {
      * @return     A IntStream view of the collection which, by default, executes sequentially.
      */
     public static IntStream intStreamAccumulatedValues(Map<?, Integer> coll) {
-        return StreamConverters.asJavaSeqIntStream(scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
+        return StreamConverters.asJavaSeqIntStream((IterableOnce<Integer>)(Object)scala.jdk.IntAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
     }
 
     //////////////////
@@ -312,7 +312,7 @@ public static IntStream intStreamAccumulatedValues(Map<?, Integer> coll) {
      * @return     A LongStream view of the collection which, by default, executes sequentially.
      */
     public static LongStream longStream(IterableOnce<Long> coll) {
-        return StreamConverters.asJavaSeqLongStream((IterableOnce<Object>)(Object)coll);
+        return StreamConverters.asJavaSeqLongStream(coll);
     }
 
     /**
@@ -353,7 +353,7 @@ public static LongStream longStreamValues(Map<?, Long> coll) {
      * @return     A LongStream view of the collection which, by default, executes sequentially.
      */
     public static LongStream longStreamAccumulated(IterableOnce<Long> coll) {
-        return StreamConverters.asJavaSeqLongStream(scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
+        return StreamConverters.asJavaSeqLongStream((IterableOnce<Long>)(Object)scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll));
     }
 
     /**
@@ -366,7 +366,7 @@ public static LongStream longStreamAccumulated(IterableOnce<Long> coll) {
      * @return     A LongStream view of the collection which, by default, executes sequentially.
      */
     public static LongStream longStreamAccumulatedKeys(Map<Long, ?> coll) {
-        return StreamConverters.asJavaSeqLongStream(scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
+        return StreamConverters.asJavaSeqLongStream((IterableOnce<Long>)(Object)scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.keysIterator()));
     }
 
     /**
@@ -379,6 +379,6 @@ public static LongStream longStreamAccumulatedKeys(Map<Long, ?> coll) {
      * @return     A LongStream view of the collection which, by default, executes sequentially.
      */
     public static LongStream longStreamAccumulatedValues(Map<?, Long> coll) {
-        return StreamConverters.asJavaSeqLongStream(scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
+        return StreamConverters.asJavaSeqLongStream((IterableOnce<Long>)(Object)scala.jdk.LongAccumulator$.MODULE$.fromSpecific((IterableOnce<Object>)(Object)coll.valuesIterator()));
     }
 }

src/main/scala/scala/compat/java8/StreamConverters.scala

@@ -21,11 +21,11 @@ import scala.collection.{IterableOnce, Stepper, StepperShape}
 import scala.compat.java8.converterImpl._
 import scala.jdk._
 import scala.language.higherKinds
-import scala.jdk.CollectionConverters.Ops._
+import scala.jdk.CollectionConverters._
 
 
 /** Defines extension methods to create Java Streams for Scala collections, available through
-  * [[scala.jdk.StreamConverters.Ops]].
+  * [[scala.compat.java8.StreamConverters]].
   */
 trait StreamExtensions {
   implicit def richStepper[A](s: Stepper[A]): StepperExtensions[A] = new StepperExtensions[A](s)

src/test/scala/scala/compat/java8/StepperTest.scala

@@ -65,7 +65,7 @@ class MappingStepper[@specialized (Double, Int, Long) A, @specialized(Double, In
 
   override def estimateSize: Long = underlying.estimateSize
 
-  override def javaIterator: util.Iterator[_] = new util.Iterator[B] {
+  override def javaIterator[C >: B]: util.Iterator[_] = new util.Iterator[B] {
     override def hasNext: Boolean = underlying.hasStep
     override def next(): B = mapping(underlying.nextStep())
   }
@@ -74,7 +74,7 @@ class MappingStepper[@specialized (Double, Int, Long) A, @specialized(Double, In
     if (undersub == null) null
     else new MappingStepper(undersub, mapping)
   }
-  def spliterator: Spliterator[_] = new MappingSpliterator[A, B](underlying.spliterator.asInstanceOf[Spliterator[A]], mapping)
+  def spliterator[C >: B]: Spliterator[_] = new MappingSpliterator[A, B](underlying.spliterator.asInstanceOf[Spliterator[A]], mapping)
 }
 
 class MappingSpliterator[A, B](private val underlying: Spliterator[A], mapping: A => B) extends Spliterator[B] {