chore: Also bump sbt and zinc versions

scalacenter · Jun 13, 2023 · 3712707 · 3712707
1 parent 9b7306a
commit 3712707
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 16 deletions.
diff --git a/backend/src/main/scala/bloop/reporter/Reporter.scala b/backend/src/main/scala/bloop/reporter/Reporter.scala
@@ -94,7 +94,15 @@ abstract class Reporter(
       case _ =>
         val mappedPos = p.position
         val problemID = if (p.position.sourceFile.isPresent) nextID() else -1
-        Problem(problemID, p.severity, p.message, mappedPos, p.category, p.diagnosticCode())
+        Problem(
+          problemID,
+          p.severity,
+          p.message,
+          mappedPos,
+          p.category,
+          p.diagnosticCode(),
+          p.diagnosticRelatedInformation()
+        )
     }
   }
 

diff --git a/frontend/src/main/scala/bloop/logging/BspServerLogger.scala b/frontend/src/main/scala/bloop/logging/BspServerLogger.scala
@@ -159,7 +159,7 @@ final class BspServerLogger private (
             message,
             bspRelatedInformation(
               event.problem
-                .diagnosticRelatedInforamation()
+                .diagnosticRelatedInformation()
                 .asScala
                 .toList,
               startLine,
@@ -194,7 +194,7 @@ final class BspServerLogger private (
             message,
             bspRelatedInformation(
               event.problem
-                .diagnosticRelatedInforamation()
+                .diagnosticRelatedInformation()
                 .asScala
                 .toList,
               startLine = 0,

diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties
@@ -1 +1,2 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
+
diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties
@@ -1 +1,2 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
+
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/custom-test-framework/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/no-test-frameworks/project/project/build.properties b/frontend/src/test/resources/no-test-frameworks/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/scala-seed-project/project/build.properties b/frontend/src/test/resources/scala-seed-project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/frontend/src/test/resources/simple-build/project/build.properties b/frontend/src/test/resources/simple-build/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -25,7 +25,7 @@ object Dependencies {
   val caseAppVersion = "2.0.6"
   val sourcecodeVersion = "0.3.0"
   val sbtTestInterfaceVersion = "1.0"
-  val sbtTestAgentVersion = "1.8.3"
+  val sbtTestAgentVersion = "1.9.0"
   val junitVersion = "0.13.3"
   val directoryWatcherVersion = "0.8.0+6-f651bd93"
   val monixVersion = "3.2.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/shared/src/main/scala/bloop/reporter/Problem.scala b/shared/src/main/scala/bloop/reporter/Problem.scala
@@ -17,7 +17,8 @@ final case class Problem private (
     /** The category of this problem. */
     category: String,
     /** Unique code attatched to the diagnostic being reported */
-    override val diagnosticCode: Optional[xsbti.DiagnosticCode]
+    override val diagnosticCode: Optional[xsbti.DiagnosticCode],
+    override val diagnosticRelatedInforamation: java.util.List[xsbti.DiagnosticRelatedInformation]
 ) extends xsbti.Problem
 
 object Problem {
@@ -28,7 +29,8 @@ object Problem {
       problem.message(),
       problem.position(),
       problem.category(),
-      problem.diagnosticCode()
+      problem.diagnosticCode(),
+      problem.diagnosticRelatedInformation()
     )
   }