Merge pull request sbt#1414 from xuwei-k/CollectionConverters-JavaCon…

…verters

[2.x] use `CollectionConverters` instead of deprecated `JavaConverters`

internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/ActionTest.scala

@@ -4,7 +4,7 @@ package inc
 
 import verify._
 import sbt.io.IO.withTemporaryDirectory
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** This is a basic test for compiler bridge, mostly wrapped as
  * AnalyzingCompiler.

internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/ExtractUsedNamesPerformanceSpecification.scala

@@ -22,7 +22,7 @@ class ExtractUsedNamesPerformanceSpecification
     catch {
       case _: FileSystemNotFoundException =>
         val env = Map("create" -> "true")
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
         Option(FileSystems.newFileSystem(uri, env.asJava))
       case _: IllegalArgumentException =>
         Option(FileSystems.getDefault)

internal/zinc-classfile/src/main/scala/sbt/internal/inc/IndexBasedZipFsOps.scala

@@ -16,7 +16,7 @@ import java.nio.file.Path
 
 import sbt.internal.inc.zip.ZipCentralDir
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.Seq
 
 /**

internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala

@@ -3,7 +3,7 @@ package classfile
 
 import java.nio.file._
 import java.nio.file.spi.FileSystemProvider
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class IndexBasedZipFsOpsSpec extends UnitSpec {
   private val XL = 0xffff // minimum size to be zip64, which I'm calling "XL"

internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala

@@ -26,7 +26,7 @@ import xsbti.{ AnalysisCallback, BasicVirtualFileRef, TestCallback, VirtualFile,
 import xsbti.TestCallback.ExtractedClassDependencies
 import xsbti.compile.SingleOutput
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object JavaCompilerForUnitTesting {
   private class TestVirtualFile(p: Path) extends BasicVirtualFileRef(p.toString) with VirtualFile {

internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClassLoaders.scala

@@ -108,7 +108,7 @@ final class ClasspathFilter(parent: ClassLoader, root: ClassLoader, classpath: S
   }
 
   override def getResources(name: String): java.util.Enumeration[URL] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val us = super.getResources(name)
     if (us ne null) us.asScala.filter(onClasspath).asJavaEnumeration else null
   }

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/AnalyzingCompiler.scala

@@ -311,7 +311,7 @@ final class AnalyzingCompiler(
 
   // see https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html
   private def loadService[A](cls: Class[A], loader: ClassLoader): Option[A] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val sl = ServiceLoader.load(cls, loader)
     val list = sl.iterator.asScala.toList
     list.lastOption

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/CompilerArguments.scala

@@ -103,7 +103,7 @@ final class CompilerArguments(
    */
   def createBootClasspath(addLibrary: Boolean): String = {
     def findBoot: String = {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       System.getProperties.asScala.iterator
         .collectFirst {
           case (k, v) if k.endsWith(".boot.class.path") => v

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/javac/LocalJava.scala

@@ -38,7 +38,7 @@ import javax.tools.{
 import sbt.internal.util.LoggerWriter
 import sbt.util.{ Level, Logger }
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.control.NonFatal
 import xsbti.{ Reporter, Logger => XLogger, PathBasedFile, VirtualFile, VirtualFileRef }
 import xsbti.compile.{
@@ -104,7 +104,7 @@ object LocalJava {
   ): Int = {
     (javadocTool, standardDocletClass) match {
       case (Some(m), Some(clz)) =>
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
         val task = m.getTask(
           out,
           null,

internal/zinc-core/src/main/scala-2.12/sbt/internal/inc/WrappedSet.scala

@@ -15,7 +15,7 @@ import xsbti.VirtualFileRef
 import scala.collection.immutable.Set
 
 private[inc] class WrappedSet(s: java.util.Set[VirtualFileRef]) extends Set[VirtualFileRef] {
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
   def iterator: Iterator[xsbti.VirtualFileRef] = s.asScala.iterator
   def contains(elem: xsbti.VirtualFileRef): Boolean = s.contains(elem)
 

internal/zinc-core/src/main/scala/sbt/internal/inc/Changes.scala

@@ -13,7 +13,7 @@ package sbt
 package internal
 package inc
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import xsbti.{ UseScope, VirtualFileRef }
 import xsbti.api.NameHash
@@ -127,7 +127,7 @@ abstract class UnderlyingChanges[A] extends Changes[A] {
   def changed: Set[A]
   def unmodified: Set[A]
 
-  import scala.collection.JavaConverters.setAsJavaSetConverter
+  import scala.jdk.CollectionConverters._
   override def getAdded: java.util.Set[A] = added.asJava
   override def getChanged: java.util.Set[A] = changed.asJava
   override def getRemoved: java.util.Set[A] = removed.asJava

internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala

@@ -23,7 +23,7 @@ import sbt.internal.inc.JavaInterfaceUtil.EnrichOption
 import sbt.util.{ InterfaceUtil, Level, Logger }
 import sbt.util.InterfaceUtil.{ jl2l, jo2o, l2jl, t2 }
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.util.control.NonFatal
 import xsbti.{ FileConverter, Position, Problem, Severity, UseScope, VirtualFile, VirtualFileRef }
@@ -1010,7 +1010,7 @@ private final class AnalysisCallback(
   }
 
   def addProductsAndDeps(base: Analysis): Analysis = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     srcs.asScala.foldLeft(base) {
       case (a, src) =>
         val stamp = stampReader.source(src)

internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala

@@ -528,7 +528,7 @@ private[inc] abstract class IncrementalCommon(
   ): (Set[String], Set[VirtualFileRef]) = {
     def classNames(srcs: Set[VirtualFileRef]): Set[String] = srcs.flatMap(previous.classNames)
     def toImmutableSet(srcs: java.util.Set[VirtualFileRef]): Set[VirtualFileRef] = {
-      import scala.collection.JavaConverters.asScalaIteratorConverter
+      import scala.jdk.CollectionConverters._
       srcs.iterator().asScala.toSet
     }
 

internal/zinc-core/src/main/scala/sbt/internal/inc/InvalidationProfiler.scala

@@ -19,7 +19,7 @@ import xsbti.compile.{ InitialChanges => XInitialChanges }
 import xsbti.compile.{ InvalidationProfiler => XInvalidationProfiler }
 import xsbti.compile.{ RunProfiler => XRunProfiler }
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 

internal/zinc-core/src/main/scala/sbt/internal/inc/Lookup.scala

@@ -66,7 +66,7 @@ trait Lookup extends ExternalLookup {
  */
 trait ExternalLookup extends ExternalHooks.Lookup {
   import sbt.internal.inc.JavaInterfaceUtil.EnrichOption
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   /**
    * Find the external `AnalyzedClass` (from another analysis) given a class name and, if available,
@@ -130,7 +130,7 @@ trait ExternalLookup extends ExternalHooks.Lookup {
       changedClasses: util.Set[String],
       previousAnalysis: CompileAnalysis
   ): Boolean = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     shouldDoIncrementalCompilation(changedClasses.iterator().asScala.toSet, previousAnalysis)
   }
 

internal/zinc-persist/src/main/scala/sbt/internal/inc/cached/CompilationCache.scala

@@ -28,7 +28,7 @@ trait CompilationCache {
 case class ProjectRebasedCache(remoteRoot: Path, cacheLocation: Path) extends CompilationCache {
   override def loadCache(projectLocation: File): Option[(CompileAnalysis, MiniSetup)] = {
     import JavaInterfaceUtil.EnrichOptional
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val projectLocationPath = projectLocation.toPath
     val readMapper = new RebaseReadWriteMapper(remoteRoot, projectLocationPath)
     val writeMapper = new RebaseReadWriteMapper(projectLocationPath, remoteRoot)

internal/zinc-persist/src/main/scala/sbt/internal/inc/text/AnalysisMappers.scala

@@ -17,7 +17,7 @@ import java.nio.file.{ Path, Paths }
 import sbt.internal.inc.UsedName
 import xsbti.{ UseScope, VirtualFileRef }
 import xsbti.compile.analysis.Stamp
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class Mapper[V](read: String => V, write: V => String)
 case class ContextAwareMapper[C, V](read: (C, String) => V, write: (C, V) => String)

internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala

@@ -780,7 +780,7 @@ case class ProjectStructure(
   }
 
   def loadIncOptions(properties: Properties): (IncOptions, Array[String]) = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val map = new java.util.HashMap[String, String]
     properties.asScala foreach { case (k: String, v: String) => map.put(k, v) }
     val base = IncOptions

zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala

@@ -22,7 +22,7 @@ import sbt.internal.inc.{
 }
 import sbt.io.IO
 
-import scala.collection.JavaConverters.asScalaIteratorConverter
+import scala.jdk.CollectionConverters._
 
 class CachedHashingSpec extends BaseCompilerSpec {
   lazy val isWindows: Boolean =