.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.10"
+version = "3.7.12"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

backend/src/main/scala/bloop/ScalaInstance.scala

@@ -17,6 +17,8 @@ import bloop.internal.build.BloopScalaInfo
 import bloop.logging.DebugFilter
 import bloop.logging.Logger
 
+import coursierapi.Repository
+
 final class ScalaInstance private (
     val organization: String,
     val name: String,
@@ -195,12 +197,14 @@ object ScalaInstance {
       scalaOrg: String,
       scalaName: String,
       scalaVersion: String,
-      logger: Logger
+      logger: Logger,
+      additionalRepositories: List[Repository] = Nil
   ): ScalaInstance = {
     def resolveInstance: ScalaInstance = {
       val allPaths = DependencyResolution.resolve(
         List(DependencyResolution.Artifact(scalaOrg, scalaName, scalaVersion)),
-        logger
+        logger,
+        additionalRepos = additionalRepositories
       )
       val allJars = allPaths.collect {
         case path if path.underlying.toString.endsWith(".jar") => path.underlying.toFile

backend/src/main/scala/sbt/internal/inc/BloopComponentCompiler.scala

@@ -27,6 +27,7 @@ import xsbti.ComponentProvider
 import xsbti.Logger
 import xsbti.compile.ClasspathOptionsUtil
 import xsbti.compile.CompilerBridgeProvider
+import scala.util.control.NonFatal
 
 object BloopComponentCompiler {
   import xsbti.compile.ScalaInstance
@@ -44,11 +45,22 @@ object BloopComponentCompiler {
 
   private val CompileConf = Some(Configurations.Compile.name)
   def getModuleForBridgeSources(scalaInstance: ScalaInstance): ModuleID = {
+    val isAfter2_13_11 =
+      try {
+        val Array(_, _, patch) = scalaInstance.version().split("\\.")
+        val patchTrimmed = patch.takeWhile(_.isDigit).toInt
+        scalaInstance.version().startsWith("2.13.") && patchTrimmed >= 12
+      } catch {
+        case NonFatal(_) => false
+      }
+
     def compilerBridgeId(scalaVersion: String) = {
+
       // Defaults to bridge for 2.13 for Scala versions bigger than 2.13.x
       scalaVersion match {
         case sc if (sc startsWith "0.") => "dotty-sbt-bridge"
         case sc if (sc startsWith "3.") => "scala3-sbt-bridge"
+        case _ if isAfter2_13_11 => "scala2-sbt-bridge"
         case sc if (sc startsWith "2.10.") => "compiler-bridge_2.10"
         case sc if (sc startsWith "2.11.") => "compiler-bridge_2.11"
         case sc if (sc startsWith "2.12.") => "compiler-bridge_2.12"
@@ -57,7 +69,7 @@ object BloopComponentCompiler {
     }
 
     val (isDotty, organization, version) = scalaInstance match {
-      case instance: BloopScalaInstance if instance.isDotty =>
+      case instance: BloopScalaInstance if instance.isDotty || isAfter2_13_11 =>
         (true, instance.organization, instance.version)
       case _ => (false, "org.scala-sbt", latestVersion)
     }
@@ -250,7 +262,12 @@ private[inc] class BloopComponentCompiler(
               .Artifact(bridgeSources.organization, bridgeSources.name, bridgeSources.revision)
           ),
           logger,
-          resolveSources = shouldResolveSources
+          resolveSources = shouldResolveSources,
+          List(
+            coursierapi.MavenRepository.of(
+              "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+            )
+          )
         ) match {
           case Right(paths) => paths.map(_.underlying).toVector
           case Left(t) =>

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

@@ -35,8 +35,11 @@ import xsbti.compile.ClassFileManager
 import xsbti.compile.IncOptions
 import xsbti.compile.Output
 import xsbti.compile.analysis.ReadStamps
+import xsbti.{Action, DiagnosticCode, DiagnosticRelatedInformation}
 
-trait IBloopAnalysisCallback extends xsbti.AnalysisCallback {
+import collection.JavaConverters._
+
+trait IBloopAnalysisCallback extends xsbti.AnalysisCallback2 {
   def get: Analysis
 }
 
@@ -115,21 +118,56 @@ final class BloopAnalysisCallback(
     startSource(converter.toVirtualFile(source.toPath()))
   }
 
-  def problem(
+  def problem2(
       category: String,
       pos: Position,
       msg: String,
       severity: Severity,
-      reported: Boolean
+      reported: Boolean,
+      rendered: ju.Optional[String],
+      diagnosticCode: ju.Optional[DiagnosticCode],
+      diagnosticRelatedInformation: ju.List[DiagnosticRelatedInformation],
+      actions: ju.List[Action]
   ): Unit = {
     for (source <- InterfaceUtil.jo2o(pos.sourceFile)) {
       val map = if (reported) reportedProblems else unreportedProblems
       map
         .getOrElseUpdate(source.toPath(), new mutable.ListBuffer())
-        .+=(InterfaceUtil.problem(category, pos, msg, severity, None, None, Nil))
+        .+=(
+          InterfaceUtil.problem(
+            category,
+            pos,
+            msg,
+            severity,
+            None,
+            InterfaceUtil.toOption(diagnosticCode),
+            diagnosticRelatedInformation.asScala.toList,
+            actions.asScala.toList
+          )
+        )
     }
   }
 
+  def problem(
+      category: String,
+      pos: Position,
+      msg: String,
+      severity: Severity,
+      reported: Boolean
+  ): Unit = {
+    problem2(
+      category,
+      pos,
+      msg,
+      severity,
+      reported,
+      rendered = ju.Optional.empty(),
+      diagnosticCode = ju.Optional.empty(),
+      diagnosticRelatedInformation = Nil.asJava,
+      actions = Nil.asJava
+    )
+  }
+
   def classDependency(
       onClassName: String,
       sourceClassName: String,

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

@@ -35,6 +35,9 @@ import xsbti.compile.ClassFileManager
 import xsbti.compile.IncOptions
 import xsbti.compile.Output
 import xsbti.compile.analysis.ReadStamps
+import xsbti.{Action, DiagnosticCode, DiagnosticRelatedInformation}
+
+import collection.JavaConverters._
 
 /**
  * This class provides a thread-safe implementation of `xsbti.AnalysisCallback` which is required to compile with the
@@ -123,21 +126,56 @@ final class ConcurrentAnalysisCallback(
     startSource(converter.toVirtualFile(source.toPath()))
   }
 
-  def problem(
+  def problem2(
       category: String,
       pos: Position,
       msg: String,
       severity: Severity,
-      reported: Boolean
+      reported: Boolean,
+      rendered: ju.Optional[String],
+      diagnosticCode: ju.Optional[DiagnosticCode],
+      diagnosticRelatedInformation: ju.List[DiagnosticRelatedInformation],
+      actions: ju.List[Action]
   ): Unit = {
     for (source <- InterfaceUtil.jo2o(pos.sourceFile)) {
       val map = if (reported) reportedProblems else unreportedProblems
       map
         .getOrElseUpdate(source.toPath(), new ConcurrentLinkedQueue)
-        .add(InterfaceUtil.problem(category, pos, msg, severity, None, None, Nil))
+        .add(
+          InterfaceUtil.problem(
+            category,
+            pos,
+            msg,
+            severity,
+            None,
+            InterfaceUtil.toOption(diagnosticCode),
+            diagnosticRelatedInformation.asScala.toList,
+            actions.asScala.toList
+          )
+        )
     }
   }
 
+  def problem(
+      category: String,
+      pos: Position,
+      msg: String,
+      severity: Severity,
+      reported: Boolean
+  ): Unit = {
+    problem2(
+      category,
+      pos,
+      msg,
+      severity,
+      reported,
+      rendered = ju.Optional.empty(),
+      diagnosticCode = ju.Optional.empty(),
+      diagnosticRelatedInformation = Nil.asJava,
+      actions = Nil.asJava
+    )
+  }
+
   def classDependency(
       onClassName: String,
       sourceClassName: String,

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

@@ -125,6 +125,13 @@ object CompileTask {
                 5
               )
           }
+          // get Bloop to replace the javac-classes-directory instead of the scip plugin so that no internal javac APIs are used.
+          val newJavacOptions = project.javacOptions.map(option =>
+            option.replaceAllLiterally(
+              "-targetroot:javac-classes-directory",
+              s"-targetroot:${newClassesDir}"
+            )
+          )
 
           val inputs = newScalacOptions.map { newScalacOptions =>
             CompileInputs(
@@ -136,7 +143,7 @@ object CompileTask {
               compileOut,
               project.out,
               newScalacOptions.toArray,
-              project.javacOptions.toArray,
+              newJavacOptions.toArray,
               project.compileJdkConfig.flatMap(_.javacBin),
               project.compileOrder,
               project.classpathOptions,

frontend/src/main/scala/bloop/logging/BspServerLogger.scala

@@ -161,10 +161,10 @@ final class BspServerLogger private (
   private def toExistingBspPosition(pos: xsbti.Position): Option[bsp.Range] = {
     def asIntPos(opt: Optional[Integer]) = InterfaceUtil.toOption(opt).map(_.toInt)
     for {
-      startLine <- asIntPos(pos.startLine())
-      startColumn <- asIntPos(pos.startColumn())
-      endLine <- asIntPos(pos.endLine())
-      endColumn <- asIntPos(pos.endColumn())
+      startLine <- asIntPos(pos.startLine()).orElse(asIntPos(pos.line()))
+      startColumn <- asIntPos(pos.startColumn()).orElse(asIntPos(pos.pointer()))
+      endLine = asIntPos(pos.endLine()).getOrElse(startLine)
+      endColumn = asIntPos(pos.endColumn()).getOrElse(startColumn)
     } yield bsp.Range(
       bsp.Position(startLine - 1, startColumn),
       bsp.Position(endLine - 1, endColumn)

frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=1.9.2
+sbt.version=1.9.4
 

frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=1.9.2
+sbt.version=1.9.4
 

frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/custom-test-framework/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/no-test-frameworks/project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/scala-seed-project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

frontend/src/test/resources/simple-build/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4

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

@@ -10,6 +10,8 @@ import bloop.task.Task
 import bloop.util.TestProject
 import bloop.util.TestUtil
 
+import coursierapi.MavenRepository
+
 object ScalaVersionsSpec extends bloop.testing.BaseSuite {
   var loggers: List[RecordingLogger] = Nil
 
@@ -22,7 +24,15 @@ object ScalaVersionsSpec extends bloop.testing.BaseSuite {
 
       def jarsForScalaVersion(version: String, logger: RecordingLogger) = {
         ScalaInstance
-          .resolve(compilerOrg, compilerArtifact, version, logger)
+          .resolve(
+            compilerOrg,
+            compilerArtifact,
+            version,
+            logger,
+            List(
+              MavenRepository.of("https://scala-ci.typesafe.com/artifactory/scala-integration/")
+            )
+          )
           .allJars
           .map(AbsolutePath(_))
       }
@@ -71,7 +81,8 @@ object ScalaVersionsSpec extends bloop.testing.BaseSuite {
     "2.12.17",
     "2.13.10",
     "3.1.3",
-    "3.2.1"
+    "3.2.1",
+    "2.13.12-bin-86f40c2"
   )
 
   val allVersions = if (TestUtil.isJdk8) jdk8OnlyVersions ++ scalaVersions else scalaVersions

integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala

@@ -144,6 +144,7 @@ object BloopDefaults {
       Option(System.getProperty("bloop.export-jar-classifiers"))
         .orElse(Option(System.getenv("BLOOP_EXPORT_JAR_CLASSIFIERS")))
         .map(_.split(",").toSet)
+        .orElse(Some(Set("sources", "javadoc")))
     },
     BloopKeys.bloopInstall := bloopInstall.value,
     BloopKeys.bloopAggregateSourceDependencies := true,

launcher-core/src/main/scala/bloop/launcher/bsp/BspBridge.scala

@@ -77,8 +77,7 @@ final class BspBridge(
         // Whenever the connection is broken or the server legitimately stops, this returns
         bspServerStatus = Some {
           bspCmd.mkString(" ") -> {
-            // Make it verbose so that bsp preparation logs are emitted
-            val args = bspCmd ++ bloopAdditionalArgs ++ List("--verbose")
+            val args = bspCmd ++ bloopAdditionalArgs
             StatusCommand(cli.run(args.toArray), "")
           }
         }

notes/v1.5.10.md

@@ -0,0 +1,46 @@
+# bloop `v1.5.10`
+
+Bloop v1.5.10 is a bugfix release.
+
+## Installing Bloop
+
+For more details about installing Bloop, please see [Bloop's Installation Guide](https://scalacenter.github.io/bloop/setup))
+
+## Merged pull requests
+
+Here's a list of pull requests that were merged:
+
+- Build(deps): Update librarymanagement-ivy from 1.9.1 to 1.9.2 [#2135]
+- Build(deps): Update sbt, test-agent from 1.9.3 to 1.9.4 [#2136]
+- Improvement: Correctly download Scala 2 bridge for Scala 2.13.12 [#2133]
+- Build(deps): Update scalafmt-core from 3.7.11 to 3.7.12 [#2130]
+- Build(deps): Update zt-zip from 1.15 to 1.16 [#2131]
+- Build(deps): Update scala-debug-adapter from 3.1.3 to 3.1.4 [#2129]
+- Specify scip javac plugin targetroot exactly [#2128]
+- Bugfix: Fix infinite recursion [#2127]
+- Build(deps): Update zinc from 1.9.2 to 1.9.3 [#2123]
+- Build(deps): Update scalafmt-core from 3.7.10 to 3.7.11 [#2126]
+- Bugfix: Handle compiler position that is not a range [#2122]
+- Chore: Remove verbose option otherwise it's always verbose [#2121]
+- Feat: fallback to `source` and `javadoc` classifiers when exporting projects from sbt [#2118]
+
+
+[#2135]: https://github.com/scalacenter/bloop/pull/2135
+[#2136]: https://github.com/scalacenter/bloop/pull/2136
+[#2133]: https://github.com/scalacenter/bloop/pull/2133
+[#2130]: https://github.com/scalacenter/bloop/pull/2130
+[#2131]: https://github.com/scalacenter/bloop/pull/2131
+[#2129]: https://github.com/scalacenter/bloop/pull/2129
+[#2128]: https://github.com/scalacenter/bloop/pull/2128
+[#2127]: https://github.com/scalacenter/bloop/pull/2127
+[#2123]: https://github.com/scalacenter/bloop/pull/2123
+[#2126]: https://github.com/scalacenter/bloop/pull/2126
+[#2122]: https://github.com/scalacenter/bloop/pull/2122
+[#2121]: https://github.com/scalacenter/bloop/pull/2121
+[#2118]: https://github.com/scalacenter/bloop/pull/2118
+
+
+## Contributors
+
+According to `git shortlog -sn --no-merges v1.5.9..v1.5.10`, the following people have contributed to
+this `v1.5.10` release: scala-center-steward[bot], tgodzik, Kamil Podsiadlo, Arthur McGibbon, Tomasz Godzik.

project/Dependencies.scala

@@ -16,17 +16,17 @@ object Dependencies {
   val nailgunCommit = "a2520c1e"
 
   // Keep in sync in BloopComponentCompiler
-  val zincVersion = "1.9.2"
+  val zincVersion = "1.9.3"
 
   val bspVersion = "2.1.0-M5"
 
   val scalazVersion = "7.3.7"
-  val lmVersion = "1.9.1"
+  val lmVersion = "1.9.2"
   val configDirsVersion = "26"
   val caseAppVersion = "2.0.6"
   val sourcecodeVersion = "0.3.0"
   val sbtTestInterfaceVersion = "1.0"
-  val sbtTestAgentVersion = "1.9.2"
+  val sbtTestAgentVersion = "1.9.4"
   val junitVersion = "0.13.3"
   val directoryWatcherVersion = "0.8.0+6-f651bd93"
   val monixVersion = "3.2.0"
@@ -37,15 +37,15 @@ object Dependencies {
   val scalaJs1Version = "1.13.2"
   val scalaJsEnvsVersion = "1.1.1"
   val xxHashVersion = "1.3.0"
-  val ztVersion = "1.15"
+  val ztVersion = "1.16"
   val difflibVersion = "1.3.0"
   val braveVersion = "5.16.0"
   val zipkinSenderVersion = "2.16.4"
   val jnaVersion = "5.13.0"
   val asmVersion = "9.5"
   val snailgunVersion = "0.4.0"
   val ztExecVersion = "1.12"
-  val debugAdapterVersion = "3.1.3"
+  val debugAdapterVersion = "3.1.4"
   val bloopConfigVersion = "1.5.5"
   val semanticdbVersion = "4.7.8"
   val zinc = "org.scala-sbt" %% "zinc" % zincVersion

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.2
+sbt.version=1.9.4