Add back Scala 2.12

amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectionProvider.scala

@@ -13,7 +13,7 @@ import javax.net.ssl.{SSLContext, TrustManager}
 
 import scala.annotation.tailrec
 import scala.collection.immutable
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /**
  * Only for internal implementations
@@ -121,7 +121,7 @@ final class AmqpDetailsConnectionProvider private (
     copy(connectionName = Option(name))
 
   override def get: Connection = {
-    import scala.jdk.CollectionConverters._
+    import scala.collection.JavaConverters._
     val factory = new ConnectionFactory
     credentials.foreach { credentials =>
       factory.setUsername(credentials.username)
@@ -331,7 +331,7 @@ final class AmqpConnectionFactoryConnectionProvider private (val factory: Connec
     copy(hostAndPorts = hostAndPorts.asScala.map(_.toScala).toIndexedSeq)
 
   override def get: Connection = {
-    import scala.jdk.CollectionConverters._
+    import scala.collection.JavaConverters._
     factory.newConnection(hostAndPortList.map(hp => new Address(hp._1, hp._2)).asJava)
   }
 

amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectorSettings.scala

@@ -7,7 +7,7 @@ package akka.stream.alpakka.amqp
 import akka.annotation.InternalApi
 import akka.util.JavaDurationConverters._
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.concurrent.duration._
 

amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala

@@ -32,7 +32,7 @@ private trait AmqpConnectorLogic { this: GraphStageLogic =>
       connection.addShutdownListener(shutdownListener)
       channel.addShutdownListener(shutdownListener)
 
-      import scala.jdk.CollectionConverters._
+      import scala.collection.JavaConverters._
 
       settings.declarations.foreach {
         case d: QueueDeclaration =>

amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala

@@ -50,7 +50,7 @@ private[amqp] final class AmqpSourceStage(settings: AmqpSourceSettings, bufferSi
       private var unackedMessages = 0
 
       override def whenConnected(): Unit = {
-        import scala.jdk.CollectionConverters._
+        import scala.collection.JavaConverters._
         channel.basicQos(bufferSize)
         val consumerCallback = getAsyncCallback(handleDelivery)
 

azure-storage-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/impl/AzureQueueSourceStage.scala

@@ -35,7 +35,7 @@ import scala.collection.mutable.Queue
       retrieveMessages()
 
     def retrieveMessages(): Unit = {
-      import scala.jdk.CollectionConverters._
+      import scala.collection.JavaConverters._
       val res = cloudQueueBuilt
         .retrieveMessages(settings.batchSize, settings.initialVisibilityTimeout, null, null)
         .asScala

azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala

@@ -15,7 +15,7 @@ import com.microsoft.azure.storage._
 import com.microsoft.azure.storage.queue._
 import org.scalatest._
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent._
 import scala.concurrent.duration._
 import scala.util.Properties

build.sbt

@@ -92,7 +92,7 @@ lazy val alpakka = project
         // springWeb triggers an esoteric ScalaDoc bug (from Java code)
         springWeb
       ),
-    licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/main/v4.1.0/ when released
+    licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/master/v4.1.0/ when released
     crossScalaVersions := List() // workaround for https://github.com/sbt/sbt/issues/3465
   )
 
@@ -433,8 +433,9 @@ def alpakkaProject(projectId: String, moduleName: String, additionalSettings: sb
     .disablePlugins(SitePlugin)
     .settings(
       name := s"akka-stream-alpakka-$projectId",
-      licenses := List(License.Apache2),
+      licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/master/v4.1.0/ when released
       AutomaticModuleName.settings(s"akka.stream.alpakka.$moduleName"),
+      scalacOptions += "-Wconf:cat=deprecation&msg=.*JavaConverters.*:s",
       mimaPreviousArtifacts := Set(
           organization.value %% name.value % previousStableVersion.value
             .getOrElse(throw new Error("Unable to determine previous version"))
@@ -454,10 +455,9 @@ def internalProject(projectId: String, additionalSettings: sbt.Def.SettingsDefin
   Project(id = projectId, base = file(projectId))
     .enablePlugins(AutomateHeaderPlugin)
     .disablePlugins(SitePlugin, MimaPlugin)
-    .settings(
-      name := s"akka-stream-alpakka-$projectId",
-      publish / skip := true
-    )
+    .settings(name := s"akka-stream-alpakka-$projectId",
+              publish / skip := true,
+              scalacOptions += "-Wconf:cat=deprecation&msg=.*JavaConverters.*:s")
     .settings(additionalSettings: _*)
 
 Global / onLoad := (Global / onLoad).value.andThen { s =>

cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraMetricsRegistry.scala

@@ -8,7 +8,7 @@ import akka.actor.{ClassicActorSystemProvider, ExtendedActorSystem, Extension, E
 import akka.annotation.InternalApi
 import com.codahale.metrics.MetricRegistry
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /**
  * Retrieves Cassandra metrics registry for an actor system

cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSession.scala

@@ -10,7 +10,7 @@ import java.util.concurrent.{CompletionStage, Executor}
 import java.util.function.{Function => JFunction}
 
 import scala.annotation.varargs
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.compat.java8.FutureConverters._
 import scala.compat.java8.OptionConverters._
 import scala.concurrent.ExecutionContext

cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraFlow.scala

@@ -10,7 +10,7 @@ import akka.stream.alpakka.cassandra.CassandraWriteSettings
 import akka.stream.scaladsl.{Flow, FlowWithContext}
 import com.datastax.oss.driver.api.core.cql.{BatchStatement, BoundStatement, PreparedStatement}
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.Future
 
 /**

cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSessionRegistry.scala

@@ -6,7 +6,7 @@ package akka.stream.alpakka.cassandra.scaladsl
 
 import java.util.concurrent.ConcurrentHashMap
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import akka.Done

cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraLifecycle.scala

@@ -13,7 +13,7 @@ import com.datastax.oss.driver.api.core.cql._
 import org.scalatest._
 import org.scalatest.concurrent.{PatienceConfiguration, ScalaFutures}
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}

cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala

@@ -19,7 +19,7 @@ import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
 import akka.stream.testkit.scaladsl.TestSink
 import com.datastax.oss.driver.api.core.cql.Row
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.compat.java8.FutureConverters._
 import scala.compat.java8.OptionConverters._

couchbase/src/main/scala/akka/stream/alpakka/couchbase/model.scala

@@ -13,7 +13,7 @@ import com.couchbase.client.java.env.CouchbaseEnvironment
 import com.couchbase.client.java.{PersistTo, ReplicateTo}
 import com.typesafe.config.Config
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.compat.java8.FutureConverters._

couchbase/src/test/scala/akka/stream/alpakka/couchbase/testing/CouchbaseSupport.scala

@@ -17,7 +17,7 @@ import com.couchbase.client.java.document.{BinaryDocument, JsonDocument, RawJson
 import org.slf4j.LoggerFactory
 import play.api.libs.json.Json
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable.Seq
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._

csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala

@@ -180,7 +180,7 @@ class CsvParsingSpec extends CsvSpec {
           .fromPath(Paths.get("csv/src/test/resources/correctness.csv"))
           .via(CsvParsing.lineScanner())
           .via(CsvToMap.toMap())
-          .map(_.view.mapValues(_.utf8String).toIndexedSeq)
+          .map(_.iterator.map { case (k, v) => k -> v.utf8String }.toIndexedSeq)
           .runWith(Sink.seq)
       val res = fut.futureValue
       res(0) should contain allElementsOf (

dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala

@@ -19,7 +19,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import software.amazon.awssdk.services.dynamodb.model.TableStatus
 
 import scala.annotation.nowarn
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext
 
 class ItemSpec extends TestKit(ActorSystem("ItemSpec")) with AsyncWordSpecLike with Matchers with BeforeAndAfterAll {

dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala

@@ -15,7 +15,7 @@ import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCrede
 import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpecLike
 

dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TestOps.scala

@@ -6,7 +6,7 @@ package akka.stream.alpakka.dynamodb
 
 import software.amazon.awssdk.services.dynamodb.model._
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 trait TestOps {
 

elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/ElasticsearchConnectionSettings.scala

@@ -9,7 +9,7 @@ import akka.http.scaladsl.model.HttpHeader
 import akka.http.scaladsl.model.HttpHeader.ParsingResult
 import akka.japi.Util
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import javax.net.ssl.SSLContext
 import scala.compat.java8.OptionConverters
 

elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/WriteMessage.scala

@@ -7,7 +7,7 @@ package akka.stream.alpakka.elasticsearch
 import akka.NotUsed
 import akka.annotation.InternalApi
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.compat.java8.OptionConverters._
 
 /**

elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala

@@ -9,7 +9,7 @@ import akka.annotation.ApiMayChange
 import akka.stream.alpakka.elasticsearch.{scaladsl, _}
 import com.fasterxml.jackson.databind.ObjectMapper
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /**
  * Java API to create Elasticsearch flows.

elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchSource.scala

@@ -13,7 +13,7 @@ import akka.stream.{Attributes, Materializer}
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.{ArrayNode, NumericNode}
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext
 
 /**

file/src/main/scala/akka/stream/alpakka/file/javadsl/LogRotatorSink.scala

@@ -15,7 +15,7 @@ import akka.stream.javadsl.Sink
 import akka.util.ByteString
 import akka.japi.function
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.Future
 
 import scala.compat.java8.FutureConverters._

file/src/test/scala/docs/scaladsl/ArchiveSpec.scala

@@ -20,7 +20,7 @@ import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 class ArchiveSpec

file/src/test/scala/docs/scaladsl/ExecutableUtils.scala

@@ -7,8 +7,9 @@ package docs.scaladsl
 import java.io.{BufferedInputStream, InputStream, OutputStream, File => JavaFile}
 import java.nio.file.{Files, Path, Paths}
 
-import akka.util.ByteString
+import scala.annotation.nowarn
 
+import akka.util.ByteString
 import scala.concurrent.Future
 import scala.sys.process.{BasicIO, Process}
 
@@ -48,9 +49,10 @@ object ExecutableUtils {
     finally stream.close()
   }
 
+  @nowarn("msg=deprecated") // Stream => LazyList
   private def readStream(stream: InputStream): ByteString = {
     val reader = new BufferedInputStream(stream)
-    try ByteString(LazyList.continually(reader.read).takeWhile(_ != -1).map(_.toByte).toArray)
+    try ByteString(Stream.continually(reader.read).takeWhile(_ != -1).map(_.toByte).toArray)
     finally reader.close()
   }
 

file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala

@@ -22,7 +22,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import scala.annotation.nowarn
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.concurrent.{ExecutionContext, Future}
 

ftp/src/main/scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala

@@ -19,7 +19,7 @@ import net.schmizz.sshj.userauth.password.{PasswordFinder, PasswordUtils, Resour
 import net.schmizz.sshj.xfer.FilePermission
 import org.apache.commons.net.DefaultSocketFactory
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.util.{Failure, Try}
 

google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/ProtobufConverters.scala

@@ -9,7 +9,7 @@ import com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions
 import com.google.cloud.bigquery.storage.v1.stream.ReadSession
 import scalapb.UnknownFieldSet
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /**
  * Internal API

google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/impl/ArrowSource.scala

@@ -18,7 +18,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 object ArrowSource {
 

google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala

@@ -12,7 +12,7 @@ import akka.stream.alpakka.googlecloud.bigquery.storage.{scaladsl => scstorage}
 import com.google.cloud.bigquery.storage.v1.arrow.{ArrowRecordBatch, ArrowSchema}
 
 import java.util.concurrent.CompletionStage
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.compat.java8.FutureConverters.FutureOps
 
 /**

google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala

@@ -11,7 +11,7 @@ import com.google.cloud.bigquery.storage.v1.avro.{AvroRows, AvroSchema}
 import com.google.cloud.bigquery.storage.v1.stream.ReadSession.TableReadOptions
 
 import java.util.concurrent.CompletionStage
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.compat.java8.FutureConverters.FutureOps
 
 /**

google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala

@@ -18,7 +18,7 @@ import com.google.cloud.bigquery.storage.v1.stream.ReadSession
 
 import java.util.concurrent.CompletionStage
 import scala.compat.java8.FutureConverters.FutureOps
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /**
  * Google BigQuery Storage Api Akka Stream operator factory.

google-cloud-bigquery-storage/src/test/java/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala

@@ -16,7 +16,7 @@ import org.apache.avro.io.DecoderFactory
 import java.util
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.{ExecutionContext, Future}
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 class AvroByteStringDecoder(schema: Schema) extends FromByteStringUnmarshaller[java.util.List[BigQueryRecord]] {
 

google-cloud-bigquery-storage/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala

@@ -18,7 +18,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.{ExecutionContext, Future}
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 class ArrowByteStringDecoder(val schema: ArrowSchema) extends FromByteStringUnmarshaller[List[BigQueryRecord]] {
 

google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/javadsl/BigQuery.scala

@@ -34,7 +34,7 @@ import java.util.concurrent.CompletionStage
 import java.{lang, util}
 
 import scala.annotation.nowarn
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.compat.java8.FutureConverters._
 import scala.compat.java8.OptionConverters._
 import scala.concurrent.duration.{FiniteDuration, MILLISECONDS}

google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/DatasetJsonProtocol.scala

@@ -9,7 +9,7 @@ import akka.stream.alpakka.googlecloud.bigquery.scaladsl.spray.BigQueryRestJsonP
 import spray.json.{JsonFormat, RootJsonFormat}
 
 import java.util
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable.Seq
 import scala.compat.java8.OptionConverters._
 

google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/JobJsonProtocol.scala

@@ -11,7 +11,7 @@ import spray.json.{JsonFormat, RootJsonFormat}
 import java.util
 
 import scala.annotation.nowarn
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.collection.immutable.Seq
 import scala.compat.java8.OptionConverters._