Merge pull request #148 from tgodzik/updates3

Update sbt, zinc and scalafmt

Author: tgodzik

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.10"
+version = "3.7.11"
 
 align.preset = more
 maxColumn = 100

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

@@ -37,8 +37,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
 }
 
@@ -118,21 +121,46 @@ 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 = {
+    problem(category, pos, msg, severity, reported)
+  }
+
   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,

build.sc

@@ -57,7 +57,7 @@ object Dependencies {
   def nailgun                = ivy"io.github.alexarchambault.bleep:nailgun-server:1.0.7"
   def osLib                  = ivy"com.lihaoyi::os-lib:0.9.0"
   def pprint                 = ivy"com.lihaoyi::pprint:0.8.1"
-  def sbtTestAgent           = ivy"org.scala-sbt:test-agent:1.9.2"
+  def sbtTestAgent           = ivy"org.scala-sbt:test-agent:1.9.3"
   def sbtTestInterface       = ivy"org.scala-sbt:test-interface:1.0"
   def scalaDebugAdapter      = ivy"ch.epfl.scala::scala-debug-adapter:3.1.3"
   def scalaJsLinker1         = ivy"org.scala-js::scalajs-linker:$scalaJs1Version"
@@ -73,7 +73,7 @@ object Dependencies {
   def svm           = ivy"org.graalvm.nativeimage:svm:$graalvmVersion"
   def utest         = ivy"com.lihaoyi::utest:0.8.1"
   def xxHashLibrary = ivy"net.jpountz.lz4:lz4:1.3.0"
-  def zinc          = ivy"org.scala-sbt::zinc:1.9.2"
+  def zinc          = ivy"org.scala-sbt::zinc:1.9.3"
   def zipkinSender  = ivy"io.zipkin.reporter2:zipkin-sender-urlconnection:2.16.4"
   def zt            = ivy"org.zeroturnaround:zt-zip:1.15"
 

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

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

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.3
 

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

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

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

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

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

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

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

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