Merge pull request #48 from scala-cli/merge-upstream

Merge upstream changes

Author: alexarchambault

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

@@ -336,7 +336,11 @@ object Compiler {
     val start = System.nanoTime()
     val scalaInstance = compileInputs.scalaInstance
     val classpathOptions = compileInputs.classpathOptions
-    val compilers = compileInputs.compilerCache.get(scalaInstance, compileInputs.javacBin)
+    val compilers = compileInputs.compilerCache.get(
+      scalaInstance,
+      compileInputs.javacBin,
+      compileInputs.javacOptions.toList
+    )
     val inputs = tracer.traceVerbose("creating zinc inputs")(_ => getInputs(compilers))
 
     // We don't need nanosecond granularity, we're happy with milliseconds

backend/src/main/scala/bloop/CompilerCache.scala

@@ -57,13 +57,18 @@ final class CompilerCache(
   private val javaCompilerCache =
     userJavacCache.getOrElse(new ConcurrentHashMap[Option[AbsolutePath], JavaCompiler]())
 
-  def get(scalaInstance: ScalaInstance, javacBin: Option[AbsolutePath]): Compilers = {
+  def get(
+      scalaInstance: ScalaInstance,
+      javacBin: Option[AbsolutePath],
+      javacOptions: List[String]
+  ): Compilers = {
     val scalaCompiler = scalaCompilerCache.computeIfAbsent(
       scalaInstance,
       getScalaCompiler(_, componentProvider)
     )
 
-    val javaCompiler = javaCompilerCache.computeIfAbsent(javacBin, getJavaCompiler(logger, _))
+    val javaCompiler =
+      javaCompilerCache.computeIfAbsent(javacBin, getJavaCompiler(logger, _, javacOptions))
 
     val javaDoc = Javadoc.local.getOrElse(Javadoc.fork())
     val javaTools = JavaTools(javaCompiler, javaDoc)
@@ -82,19 +87,25 @@ final class CompilerCache(
     )
   }
 
-  def getJavaCompiler(logger: Logger, javacBin: Option[AbsolutePath]): JavaCompiler = {
+  def getJavaCompiler(
+      logger: Logger,
+      javacBin: Option[AbsolutePath],
+      javacOptions: List[String]
+  ): JavaCompiler = {
+    val allowLocal = !javacOptions.exists(_.startsWith("-J"))
     javacBin match {
       case Some(bin) if JavaRuntime.javac.exists(isSameCompiler(logger, _, bin)) =>
         // Same bin as the one derived from this VM? Prefer built-in compiler if JDK
         JavaRuntime.javaCompiler match {
-          case Some(compiler) => new BloopMaybeForkedJavaCompiler(compiler, Some(bin.toFile))
-          case None => new BloopForkedJavaCompiler(Some(bin.toFile))
+          case Some(compiler) if allowLocal =>
+            new BloopMaybeForkedJavaCompiler(compiler, Some(bin.toFile))
+          case _ => new BloopForkedJavaCompiler(Some(bin.toFile))
         }
       case Some(bin) => new BloopForkedJavaCompiler(Some(bin.toFile))
       case None =>
         JavaRuntime.javaCompiler match {
-          case Some(compiler) => new BloopMaybeForkedJavaCompiler(compiler, None)
-          case None => new BloopForkedJavaCompiler(None)
+          case Some(compiler) if allowLocal => new BloopMaybeForkedJavaCompiler(compiler, None)
+          case _ => new BloopForkedJavaCompiler(None)
         }
     }
   }

build.sbt

@@ -224,6 +224,7 @@ lazy val `bloopgun-core` = project
     buildInfoPackage := "bloopgun.internal.build",
     buildInfoKeys := List(version),
     buildInfoObject := "BloopgunInfo",
+    crossScalaVersions := Seq(Dependencies.Scala212Version, Dependencies.Scala213Version),
     libraryDependencies ++= List(
       Dependencies.snailgun,
       // Use zt-exec instead of nuprocess because it doesn't require JNA (good for graalvm)
@@ -277,11 +278,20 @@ lazy val bloopgun = project
   )
 
 lazy val launcher = project
-  .dependsOn(`bloopgun-core`, frontend % "test->test")
-  .settings(testSuiteSettings)
+  .dependsOn(`bloopgun-core`)
   .settings(
     sonatypeSetting,
     name := "bloop-launcher",
+    crossScalaVersions := Seq(Dependencies.Scala212Version, Dependencies.Scala213Version)
+  )
+
+lazy val launcherTest: Project = project
+  .in(file("launcher-test"))
+  .disablePlugins(ScriptedPlugin)
+  .dependsOn(`bloopgun-core`, frontend % "test->test", launcher)
+  .settings(testSuiteSettings)
+  .settings(
+    name := "bloop-launcher-test",
     fork in Test := true,
     parallelExecution in Test := false,
     libraryDependencies ++= List(
@@ -350,6 +360,7 @@ lazy val stuff = project
     frontend,
     backend,
     launcher,
+    launcherTest,
     bloopgun,
     `bloopgun-core`,
     shared,

docs/build-tools/sbt.md

@@ -88,9 +88,9 @@ Here's a list of bloop commands you can run next to start playing with bloop:
 
 ## Next steps after installation
 
-Use an IDE such as [Metals](docs/ides/metals) or
-[IntelliJ](docs/ides/intellij) to write code or play with the
-[CLI](docs/cli/tutorial) if you want to explore what CLI options are
+Use an IDE such as [Metals](/bloop/docs/ides/metals) or
+[IntelliJ](/bloop/docs/ides/intellij) to write code or play with the
+[CLI](/bloop/docs/cli/tutorial) if you want to explore what CLI options are
 available.
 
 If you need help, you can always come over to our [Discord

frontend/src/main/scala/bloop/data/Project.scala

@@ -251,8 +251,15 @@ final case class Project(
           getJavaVersionFromJavaHome(f.javaHome)
       )
       .getOrElse(Properties.javaVersion)
-
-    compareVersions(compileVersion, version) >= 0
+      .split("-")
+      .head // needed for versions like 17-ea
+    try {
+      compareVersions(compileVersion, version) >= 0
+    } catch {
+      case NonFatal(_) =>
+        logger.error(s"Invalid Java number $compileVersion")
+        false
+    }
   }
 }
 

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

@@ -64,7 +64,10 @@ object Tasks {
         val javacBin = project.runtimeJdkConfig.flatMap(_.javacBin)
         val loader = ClasspathUtilities.makeLoader(entries, instance)
         val compiler =
-          state.compilerCache.get(instance, javacBin).scalac.asInstanceOf[AnalyzingCompiler]
+          state.compilerCache
+            .get(instance, javacBin, project.javacOptions)
+            .scalac
+            .asInstanceOf[AnalyzingCompiler]
         val opts = ClasspathOptionsUtil.repl
         val options = project.scalacOptions :+ "-Xnojline"
         // We should by all means add better error handling here!

frontend/src/test/scala/bloop/ScalaVersionsSpec.scala

@@ -73,6 +73,7 @@ object ScalaVersionsSpec extends bloop.testing.BaseSuite {
     val `2.13` = compileProjectFor("2.13.2")
     val `2.13.3` = compileProjectFor("2.13.3")
     val `2.13.7` = compileProjectFor("2.13.7")
+    val `2.13.8` = compileProjectFor("2.13.8")
     val LatestDotty = compileProjectFor("3.0.0-M3")
     val all = List(`2.12`, `2.13`, `2.13.3`, `2.13.7`)
 

frontend/src/test/scala/bloop/dap/DebugAdapterConnection.scala

@@ -152,7 +152,7 @@ private[dap] final class DebugAdapterConnection(
 object DebugAdapterConnection {
   def connectTo(uri: URI)(scheduler: Scheduler): DebugAdapterConnection = {
     val socket = new Socket()
-    socket.connect(new InetSocketAddress(uri.getHost, uri.getPort), 500)
+    socket.connect(new InetSocketAddress(uri.getHost, uri.getPort), 10000)
 
     val proxy = DebugAdapterProxy(socket)
     proxy.startBackgroundListening(scheduler)

frontend/src/test/scala/bloop/dap/DebugServerSpec.scala

@@ -478,7 +478,7 @@ object DebugServerSpec extends DebugBspBaseSuite {
         assert(debuggeeCanceled, serverClosed)
       }
 
-      TestUtil.await(FiniteDuration(5, SECONDS), ExecutionContext.ioScheduler)(test)
+      TestUtil.await(FiniteDuration(20, SECONDS), ExecutionContext.ioScheduler)(test)
     }
   }