Skip to content

Commit

Permalink
Merge pull request #2480 from scalacenter/update/sbt-1.10.3
Browse files Browse the repository at this point in the history
build(deps): Update sbt, test-agent, zinc from 1.10.2 to 1.10.3
  • Loading branch information
tgodzik authored Oct 21, 2024
2 parents cd1c3d3 + 4ac8098 commit 4cb70ac
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 16 deletions.
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
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
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.2
sbt.version=1.10.3

Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
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
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3

0 comments on commit 4cb70ac

Please sign in to comment.