scalacenter · tgodzik · Oct 21, 2022 · Jul 2, 2022 · Oct 20, 2022 · ckipp01
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -219,7 +219,7 @@ jobs:
         # cmd.
         # Keep the sbt version in sync with `sbt-ci-release.bat`.
         run: |
-          sbt -sbt-version 1.6.2 version
+          sbt -sbt-version 1.7.2 version
         shell: bash
       - name: Publish GraalVM Native artifacts
         run: >-

diff --git a/backend/src/main/scala/bloop/reporter/Reporter.scala b/backend/src/main/scala/bloop/reporter/Reporter.scala
@@ -94,7 +94,7 @@ 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)
+        Problem(problemID, p.severity, p.message, mappedPos, p.category, p.diagnosticCode())
     }
   }
 

diff --git a/bin/sbt-ci-release.bat b/bin/sbt-ci-release.bat
@@ -1,2 +1,2 @@
 Rem Keep ci.yaml in sync with the sbt version
-sbt -sbt-version 1.6.2 bloopgun/graalvm-native-image:packageBin
+sbt -sbt-version 1.7.2 bloopgun/graalvm-native-image:packageBin
diff --git a/frontend/src/main/scala/bloop/logging/BspServerLogger.scala b/frontend/src/main/scala/bloop/logging/BspServerLogger.scala
@@ -102,7 +102,7 @@ final class BspServerLogger private (
     val problemPos = event.problem.position
     val problemSeverity = event.problem.severity
     val sourceFile = toOption(problemPos.sourceFile())
-    // TODO: Add code content
+    val code = toOption(event.problem.diagnosticCode()).map(_.code())
 
     (problemPos, sourceFile) match {
       case (ZincInternals.ZincExistsStartPos(startLine, startColumn), Some(file)) =>
@@ -120,7 +120,7 @@ final class BspServerLogger private (
         val source = Some("bloop")
         val uri = bsp.Uri(file.toPath.toUri)
         val severity = bspSeverity(problemSeverity)
-        val diagnostic = bsp.Diagnostic(pos, Some(severity), None, source, message, None)
+        val diagnostic = bsp.Diagnostic(pos, Some(severity), code, source, message, None)
         val textDocument = bsp.TextDocumentIdentifier(uri)
         val buildTargetId = bsp.BuildTargetIdentifier(event.projectUri)
         client.notify(

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 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/custom-test-framework/project/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/frontend/src/test/resources/no-test-frameworks/project/build.properties b/frontend/src/test/resources/no-test-frameworks/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
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.6.2
+sbt.version=1.7.2
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -14,7 +14,7 @@ object Dependencies {
   val nailgunCommit = "a2520c1e"
 
   // Keep in sync in BloopComponentCompiler
-  val zincVersion = "1.6.0"
+  val zincVersion = "1.7.2"
 
   val bspVersion = "2.0.0"
   val javaDebugVersion = "0.21.0+1-7f1080f1"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/shared/src/main/scala/bloop/reporter/Problem.scala b/shared/src/main/scala/bloop/reporter/Problem.scala
@@ -1,5 +1,7 @@
 package bloop.reporter
 
+import java.util.Optional
+
 import xsbti.Severity
 
 /** Describes a problem (error, warning, message, etc.) given to the reporter. */
@@ -13,12 +15,21 @@ final case class Problem private (
     /** Position in the source code where the message was triggered */
     position: xsbti.Position,
     /** The category of this problem. */
-    category: String
+    category: String,
+    /** Unique code attatched to the diagnostic being reported */
+    override val diagnosticCode: Optional[xsbti.DiagnosticCode]
 ) extends xsbti.Problem
 
 object Problem {
   def fromZincProblem(problem: xsbti.Problem): Problem = {
-    Problem(-1, problem.severity(), problem.message(), problem.position(), problem.category())
+    Problem(
+      -1,
+      problem.severity(),
+      problem.message(),
+      problem.position(),
+      problem.category(),
+      problem.diagnosticCode()
+    )
   }
 
   case class DiagnosticsCount(errors: Long, warnings: Long) {