Use Scala 2.13 JDK Converters

gaeljw · gaeljw · commit af66b1a37900 · 2020-05-08T18:38:11.000+02:00
diff --git a/scala/scala_2.11/pom.xml b/scala/scala_2.11/pom.xml
@@ -18,6 +18,11 @@
             <version>${scala.2.11.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-collection-compat_2.11</artifactId>
+            <version>2.1.6</version>
+        </dependency>
 
         <!-- Users have to provide it (for JacksonDefaultDataTableTransformer) -->
         <dependency>
diff --git a/scala/scala_2.12/pom.xml b/scala/scala_2.12/pom.xml
@@ -18,6 +18,11 @@
             <version>${scala.2.12.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-collection-compat_2.12</artifactId>
+            <version>2.1.6</version>
+        </dependency>
 
         <!-- Users have to provide it (for JacksonDefaultDataTableTransformer) -->
         <dependency>
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/AbstractDatatableElementTransformerDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/AbstractDatatableElementTransformerDefinition.scala
@@ -3,7 +3,7 @@ package io.cucumber.scala
 import io.cucumber.datatable.DataTable
 
 import scala.util.{Failure, Success, Try}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait AbstractDatatableElementTransformerDefinition extends AbstractGlueDefinition {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaBackend.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaBackend.scala
@@ -8,7 +8,7 @@ import java.util.{List => JList}
 import io.cucumber.core.backend._
 import io.cucumber.core.resource.{ClasspathScanner, ClasspathSupport}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 class ScalaBackend(lookup: Lookup, container: Container, classLoaderProvider: Supplier[ClassLoader]) extends Backend {
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala
@@ -5,7 +5,7 @@ import java.util.{Map => JavaMap}
 import io.cucumber.core.backend.ScenarioScoped
 import io.cucumber.datatable.{DataTableType, TableEntryTransformer}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait ScalaDataTableEntryDefinition[T] extends ScalaDataTableTypeDefinition {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala
@@ -5,7 +5,7 @@ import java.util.{List => JavaList}
 import io.cucumber.core.backend.ScenarioScoped
 import io.cucumber.datatable.{DataTableType, TableRowTransformer}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait ScalaDataTableRowDefinition[T] extends ScalaDataTableTypeDefinition {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala
@@ -6,7 +6,7 @@ import java.util.{Map => JavaMap}
 import io.cucumber.core.backend.{DefaultDataTableEntryTransformerDefinition, ScenarioScoped}
 import io.cucumber.datatable.{TableCellByTypeTransformer, TableEntryByTypeTransformer}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait ScalaDefaultDataTableEntryTransformerDefinition extends DefaultDataTableEntryTransformerDefinition with AbstractDatatableElementTransformerDefinition {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala
@@ -3,7 +3,7 @@ package io.cucumber.scala
 import io.cucumber.core.backend.{ParameterTypeDefinition, ScenarioScoped}
 import io.cucumber.cucumberexpressions.{CaptureGroupTransformer, ParameterType}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait ScalaParameterTypeDefinition[R] extends ParameterTypeDefinition with AbstractGlueDefinition {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaSnippet.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaSnippet.scala
@@ -7,7 +7,7 @@ import java.util.{Map => JMap}
 import io.cucumber.core.backend.Snippet
 import io.cucumber.datatable.DataTable
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object ScalaSnippet {
 
diff --git a/scala/sources/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala b/scala/sources/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala
@@ -5,7 +5,7 @@ import java.util.{List => JList}
 
 import io.cucumber.core.backend.{ParameterInfo, ScenarioScoped, StepDefinition}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 
 trait ScalaStepDefinition extends StepDefinition with AbstractGlueDefinition {
diff --git a/scala/sources/src/test/scala/io/cucumber/scala/ScalaBackendTest.scala b/scala/sources/src/test/scala/io/cucumber/scala/ScalaBackendTest.scala
@@ -11,7 +11,7 @@ import org.junit.{Before, Test}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class ScalaBackendTest {
 
diff --git a/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslDataTableTypeTest.scala b/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslDataTableTypeTest.scala
@@ -5,7 +5,7 @@ import io.cucumber.scala.ScalaDslDataTableTypeTest.{Author, Cell, GroupOfAuthor}
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object ScalaDslDataTableTypeTest {
 
diff --git a/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslDefaultDataTableEntryTransformerTest.scala b/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslDefaultDataTableEntryTransformerTest.scala
@@ -4,7 +4,7 @@ import io.cucumber.core.backend._
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 
 class ScalaDslDefaultDataTableEntryTransformerTest {
diff --git a/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslParameterTypeTest.scala b/scala/sources/src/test/scala/io/cucumber/scala/ScalaDslParameterTypeTest.scala
@@ -5,7 +5,7 @@ import io.cucumber.scala.ScalaDslParameterTypeTest.Point
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object ScalaDslParameterTypeTest {
 
diff --git a/scala/sources/src/test/scala/io/cucumber/scala/ScalaSnippetTest.scala b/scala/sources/src/test/scala/io/cucumber/scala/ScalaSnippetTest.scala
@@ -9,7 +9,7 @@ import io.cucumber.cucumberexpressions.{CaptureGroupTransformer, ParameterType,
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class ScalaSnippetTest {
 
diff --git a/scala/sources/src/test/scala/tests/cukes/StepDefs.scala b/scala/sources/src/test/scala/tests/cukes/StepDefs.scala
@@ -7,7 +7,7 @@ import io.cucumber.scala.{EN, ScalaDsl}
 import junit.framework.Assert._
 import tests.cukes.model.{Cukes, Person, Snake}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * Test step definitions to exercise Scala cucumber
diff --git a/scala/sources/src/test/scala/tests/datatables/DatatablesSteps.scala b/scala/sources/src/test/scala/tests/datatables/DatatablesSteps.scala
@@ -5,7 +5,7 @@ import java.util.{List => JList, Map => JMap}
 
 import io.cucumber.datatable.DataTable
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 
 class DatatablesSteps extends ScalaDsl with EN {
diff --git a/scala/sources/src/test/scala/tests/isolated/IsolatedSteps.scala b/scala/sources/src/test/scala/tests/isolated/IsolatedSteps.scala
@@ -3,7 +3,7 @@ package tests.isolated
 import java.util.{List => JList}
 import io.cucumber.scala.{EN, ScalaDsl}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class IsolatedSteps extends ScalaDsl with EN {
 
diff --git a/scala/sources/src/test/scala/tests/jackson/JacksonSteps.scala b/scala/sources/src/test/scala/tests/jackson/JacksonSteps.scala
@@ -2,7 +2,7 @@ package tests.jackson
 
 import io.cucumber.scala.{EN, JacksonDefaultDataTableEntryTransformer, ScalaDsl}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class MyCaseClass(field1: Double, field2: Boolean, field3: String)
 
diff --git a/scala/sources/src/test/scala/tests/parametertypes/ParameterTypesSteps.scala b/scala/sources/src/test/scala/tests/parametertypes/ParameterTypesSteps.scala
@@ -5,7 +5,7 @@ import java.util.{List => JavaList}
 import io.cucumber.datatable.DataTable
 import io.cucumber.scala.{EN, ScalaDsl}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class Point(x: Int, y: Int)
 
