Cross-compile things with 2.13 (#133)

Author: alexarchambault

backend/src/main/scala/bloop/Compiler.scala

@@ -37,7 +37,7 @@ import sbt.internal.inc.bloop.internal.BloopStamps
 import sbt.util.InterfaceUtil
 import xsbti.T2
 import xsbti.VirtualFileRef
-import xsbti.compile._
+import xsbti.compile.{CompilerCache => _, ScalaInstance => _, _}
 
 case class CompileInputs(
     scalaInstance: ScalaInstance,

backend/src/main/scala/bloop/reporter/Reporter.scala

@@ -364,7 +364,7 @@ object Reporter {
     override def reverse: Buffer[A] = {
       val reversed = mutable.Stack.empty[A]
       weakIterator.foreach(reversed.push)
-      newBuffer(reversed: _*)
+      newBuffer(reversed.toSeq: _*)
     }
     override def toList: List[A] = weakIterator.toList
     override def toArray[B >: A: ClassTag]: Array[B] = weakIterator.toArray

backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala

@@ -320,7 +320,8 @@ final class BloopAnalysisCallback(
   override def isPickleJava(): Boolean = false
   override def getPickleJarPair(): ju.Optional[T2[Path, Path]] = ju.Optional.empty()
 
-  def getOrNil[A, B](m: collection.Map[A, Seq[B]], a: A): Seq[B] = m.get(a).toList.flatten
+  def getOrNil[A, B](m: collection.Map[A, mutable.ListBuffer[B]], a: A): Seq[B] =
+    m.get(a).toList.flatten
   def addCompilation(base: Analysis): Analysis =
     base.copy(compilations = base.compilations.add(compilation))
   def addUsedNames(base: Analysis): Analysis = usedNames.foldLeft(base) {

backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala

@@ -313,7 +313,10 @@ final class ConcurrentAnalysisCallback(
   override def isPickleJava(): Boolean = false
   override def getPickleJarPair(): ju.Optional[T2[Path, Path]] = ju.Optional.empty()
 
-  def getOrNil[A, B](m: collection.Map[A, Seq[B]], a: A): Seq[B] = m.get(a).toList.flatten
+  def getOrNil[A, B](m: collection.Map[A, ConcurrentLinkedQueue[B]], a: A): Seq[B] = {
+    import scala.collection.JavaConverters._
+    m.get(a).map(_.asScala.toList).getOrElse(Nil)
+  }
   def addCompilation(base: Analysis): Analysis =
     base.copy(compilations = base.compilations.add(compilation))
   def addUsedNames(base: Analysis): Analysis = usedNames.foldLeft(base) {
@@ -379,9 +382,9 @@ final class ConcurrentAnalysisCallback(
             .map(_._1)
         val analyzedApis = classesInSrc.map(analyzeClass)
         val info = SourceInfos.makeInfo(
-          getOrNil(reportedProblems.mapValues { _.asScala.toSeq }, src),
-          getOrNil(unreportedProblems.mapValues { _.asScala.toSeq }, src),
-          getOrNil(mainClasses.mapValues { _.asScala.toSeq }, src)
+          getOrNil(reportedProblems, src),
+          getOrNil(unreportedProblems, src),
+          getOrNil(mainClasses, src)
         )
         val binaries = binaryDeps.getOrElse(src, ConcurrentHashMap.newKeySet[Path]).asScala
         val localProds = localClasses

build.sbt

@@ -158,6 +158,7 @@ lazy val frontend: Project = project
       "jsBridge1" -> (jsBridge1Name + "_" + Keys.scalaBinaryVersion.value),
       "snailgunVersion" -> Dependencies.snailgunVersion
     ),
+    libraryDependencySchemes += "org.scala-lang.modules" %% "scala-parallel-collections" % "always",
     (run / javaOptions) ++= jvmOptions,
     (Test / javaOptions) ++= jvmOptions,
     tmpDirSettings,

frontend/src/main/scala/bloop/dap/BloopDebuggee.scala

@@ -306,7 +306,13 @@ object BloopDebuggeeRunner {
       val classDir = client.getUniqueClassesDirFor(project, forceGeneration = true)
       val projectName = project.bspUri.toString
       val scalaVersion = project.scalaInstance.map(si => ScalaVersion(si.version))
-      Module(projectName, scalaVersion, project.scalacOptions, classDir.underlying, sourceBuffer)
+      Module(
+        projectName,
+        scalaVersion,
+        project.scalacOptions,
+        classDir.underlying,
+        sourceBuffer.toSeq
+      )
     }
   }
 }

frontend/src/main/scala/bloop/engine/caches/ResultsCache.scala

@@ -83,8 +83,8 @@ final case class ResultsCache private (
       Paths.delete(path)
     }
     // Remove all the successful results from the cache.
-    val newSuccessful = successful.filterKeys(p => !projects.contains(p))
-    val newAll = all.filterKeys(p => !projects.contains(p))
+    val newSuccessful = successful.filterKeys(p => !projects.contains(p)).toMap
+    val newAll = all.filterKeys(p => !projects.contains(p)).toMap
     val deleteClassesDirs = successful.filterKeys(projects.contains).flatMap {
       case (project, result) =>
         List(

frontend/src/main/scala/bloop/engine/tasks/TestTask.scala

@@ -320,21 +320,24 @@ object TestTask {
     // usually it is a Array(new SuiteSelector). However, if only subset of test are supposed to
     // be run, then it can be altered to Array[TestSelector]
     val selectedTests = testClasses.suites.map(entry => (entry.className, entry.tests)).toMap
-    includedTests.groupBy(_.framework).mapValues { taskDefs =>
-      taskDefs.map {
-        case TaskDefWithFramework(taskDef, _) =>
-          selectedTests.get(taskDef.fullyQualifiedName()).getOrElse(Nil) match {
-            case Nil => taskDef
-            case selectedTests =>
-              new TaskDef(
-                taskDef.fullyQualifiedName(),
-                taskDef.fingerprint(),
-                false,
-                selectedTests.map(test => new TestSelector(test)).toList.toArray
-              )
-          }
+    includedTests
+      .groupBy(_.framework)
+      .mapValues { taskDefs =>
+        taskDefs.map {
+          case TaskDefWithFramework(taskDef, _) =>
+            selectedTests.get(taskDef.fullyQualifiedName()).getOrElse(Nil) match {
+              case Nil => taskDef
+              case selectedTests =>
+                new TaskDef(
+                  taskDef.fullyQualifiedName(),
+                  taskDef.fingerprint(),
+                  false,
+                  selectedTests.map(test => new TestSelector(test)).toList.toArray
+                )
+            }
+        }
       }
-    }
+      .toMap
   }
 
   private[bloop] def discoverTests(

frontend/src/main/scala/bloop/engine/tasks/compilation/CompileDependenciesData.scala

@@ -74,8 +74,8 @@ object CompileDependenciesData {
               val newExistingResources =
                 existingResources.filterNot(r => addedResources.contains(r))
               newExistingResources.foreach(r => addedResources.add(r))
-              newExistingResources ++ classesDirs
-            case None => classesDirs
+              (newExistingResources ++ classesDirs).toSeq
+            case None => classesDirs.toSeq
           }
         case None => List(entry)
       }

frontend/src/main/scala/bloop/util/CommandsDocGenerator.scala

@@ -185,6 +185,6 @@ object CommandsDocGenerator {
         }
     }
 
-    parsed.map(_.groupBy(_.projectName).mapValues(_.flatMap(_.examples)))
+    parsed.map(_.groupBy(_.projectName).mapValues(_.flatMap(_.examples)).toMap)
   }
 }