Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): Update sbt, test-agent, zinc from 1.10.2 to 1.10.3 #2480

Merged
merged 2 commits into from
Oct 21, 2024
Merged

build(deps): Update sbt, test-agent, zinc from 1.10.2 to 1.10.3 #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e614d4
build(deps): Update sbt, test-agent, zinc from 1.10.2 to 1.10.3
scala-center-steward[bot] Oct 21, 2024
4ac8098
bugfix: Fix compilation after updating sbt
tgodzik Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ import xsbti.api.SafeLazyProxy
import xsbti.compile.ClassFileManager
import xsbti.compile.IncOptions
import xsbti.compile.Output
import xsbti.compile.analysis.ReadSourceInfos
import xsbti.compile.analysis.ReadStamps

trait IBloopAnalysisCallback extends xsbti.AnalysisCallback2 {
trait IBloopAnalysisCallback extends xsbti.AnalysisCallback3 {
def get: Analysis
}

Expand Down Expand Up @@ -103,6 +104,14 @@ final class BloopAnalysisCallback(
()
}

override def toVirtualFile(path: Path): VirtualFile = {
converter.toVirtualFile(path)
}

override def getSourceInfos(): ReadSourceInfos = {
get.readSourceInfos()
}

def startSource(source: VirtualFile): Unit = {
val sourcePath = converter.toPath(source)
if (options.strictMode()) {
Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopHighLevelCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ final class BloopHighLevelCompiler(
case t: StackOverflowError =>
val msg = "Encountered a StackOverflowError coming from the compiler. You might need to restart your Bloop build server"
logger.error(s"${msg}:\n${t.getStackTrace().mkString("\n")}")
throw new CompileFailed(new Array(0), msg, new Array(0), t)
throw new CompileFailed(new Array(0), msg, new Array(0), None, t)
case t: NoClassDefFoundError =>
val msg = "Encountered a NoClassDefFoundError coming from the compiler. You might need to clean compile your workspace"
logger.error(s"${msg}:\n${t.getStackTrace().mkString("\n")}")
throw new CompileFailed(new Array(0), msg, new Array(0), t)
throw new CompileFailed(new Array(0), msg, new Array(0), None, t)
case NonFatal(t) =>
// If scala compilation happens, complete the java promise so that it doesn't block
JavaCompleted.tryFailure(t)
Expand Down
9 changes: 9 additions & 0 deletions backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import xsbti.compile.ClassFileManager
import xsbti.compile.IncOptions
import xsbti.compile.Output
import xsbti.compile.analysis.ReadStamps
import xsbti.compile.analysis.ReadSourceInfos

/**
* This class provides a thread-safe implementation of `xsbti.AnalysisCallback` which is required to compile with the
Expand Down Expand Up @@ -112,6 +113,14 @@ final class ConcurrentAnalysisCallback(
()
}

override def toVirtualFile(path: Path): VirtualFile = {
converter.toVirtualFile(path)
}

override def getSourceInfos(): ReadSourceInfos = {
get.readSourceInfos()
}

def startSource(source: VirtualFile): Unit = {
val sourcePath = converter.toPath(source)
if (options.strictMode()) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/custom-test-framework/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/no-test-frameworks/project/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/scala-seed-project/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion frontend/src/test/resources/simple-build/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Dependencies {
val SbtVersion = "1.5.8"

// Keep in sync in BloopComponentCompiler
val zincVersion = "1.10.2"
val zincVersion = "1.10.3"

val bspVersion = "2.1.1"

Expand All @@ -23,7 +23,7 @@ object Dependencies {
val coursierVersion = "2.1.14"
val sourcecodeVersion = "0.4.2"
val sbtTestInterfaceVersion = "1.0"
val sbtTestAgentVersion = "1.10.2"
val sbtTestAgentVersion = "1.10.3"
val junitVersion = "0.13.3"
val directoryWatcherVersion = "0.8.0+6-f651bd93"
val monixVersion = "3.2.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Loading