From 60bd3f91f6f0b2e996a7077570d3e546e7e35c67 Mon Sep 17 00:00:00 2001 From: tgodzik Date: Thu, 27 Jul 2023 12:53:52 +0200 Subject: [PATCH 1/4] chore: Update zinc to 1.9.3 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 03660a3c10..a2316f0ac8 100644 --- a/build.sc +++ b/build.sc @@ -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" From 0e63626cce4f85f1babd5eb1920981d17bc28ae3 Mon Sep 17 00:00:00 2001 From: tgodzik Date: Wed, 26 Jul 2023 20:31:39 +0200 Subject: [PATCH 2/4] bugfix: Switch to AnalysisCallback2 --- .../internal/BloopAnalysisCallback.scala | 36 +++++++++++++-- .../internal/ConcurrentAnalysisCallback.scala | 44 +++++++++++++++++-- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala index b17addd9d5..7536647607 100644 --- a/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala +++ b/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, diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala index 395aecac98..c7c108ce1c 100644 --- a/backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala +++ b/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, From cc2c2029e42fa37b6e8c47cf13e308ba451deae1 Mon Sep 17 00:00:00 2001 From: tgodzik Date: Wed, 26 Jul 2023 21:43:10 +0200 Subject: [PATCH 3/4] chore: Also bump sbt to 1.9.3 --- build.sc | 2 +- .../compiler-plugin-allowlist/project/build.properties | 2 +- .../cross-test-build-scala-native-0.4/project/build.properties | 2 +- .../cross-test-build-scalajs-0.6/project/build.properties | 2 +- .../cross-test-build-scalajs-1.0/project/build.properties | 2 +- .../cross-test-build-scalajs-1.x/project/build.properties | 2 +- .../resources/custom-test-framework/project/build.properties | 2 +- .../no-test-frameworks/project/project/build.properties | 2 +- .../test/resources/scala-seed-project/project/build.properties | 2 +- .../src/test/resources/simple-build/project/build.properties | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sc b/build.sc index a2316f0ac8..5c4796470e 100644 --- a/build.sc +++ b/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" diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties index 7a2f2cd1bd..91550e8201 100644 --- a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties +++ b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.9.2 +sbt.version=1.9.3 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 index 7a2f2cd1bd..91550e8201 100644 --- 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,2 +1,2 @@ -sbt.version=1.9.2 +sbt.version=1.9.3 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 index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 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 index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 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 index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 diff --git a/frontend/src/test/resources/custom-test-framework/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/build.properties index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 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 index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 diff --git a/frontend/src/test/resources/scala-seed-project/project/build.properties b/frontend/src/test/resources/scala-seed-project/project/build.properties index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 diff --git a/frontend/src/test/resources/simple-build/project/build.properties b/frontend/src/test/resources/simple-build/project/build.properties index 875b706a8e..52413ab79a 100644 --- 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.9.2 +sbt.version=1.9.3 From 674f0a320a7b98a0f92acb696ed151f05a9de41c Mon Sep 17 00:00:00 2001 From: "scala-center-steward[bot]" <111975575+scala-center-steward[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 00:15:59 +0000 Subject: [PATCH 4/4] build(deps): Update scalafmt-core from 3.7.10 to 3.7.11 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b2868f0b9a..4e09453eac 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.10" +version = "3.7.11" align.preset = more maxColumn = 100