luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8070 from eed3si9n/wip/bump-io 

[1.x] fix: Use Retry.io for compilation
This commit is contained in:
eugene yokota 2025-03-16 22:25:06 -04:00 committed by GitHub
parent 75536d12a5 12d2cc8ef1
commit 1b4a345406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/internal/server/BspCompileTask.scala
View File

@ -16,7 +16,6 @@ import sbt.internal.server.BspCompileTask.exchange
import sbt.librarymanagement.Configuration
import sbt.util.InterfaceUtil
import sjsonnew.support.scalajson.unsafe.Converter
import xsbti.CompileCancelled
import xsbti.CompileFailed
import xsbti.Problem
import xsbti.Severity
@ -39,7 +38,7 @@ object BspCompileTask {
val task = BspCompileTask(targetId, project, config, ci)
try {
task.notifyStart()
val result = Retry(compile(task), classOf[CompileCancelled], classOf[CompileFailed])
val result = Retry.io(compile(task))
task.notifySuccess(result)
result
} catch {

2
project/Dependencies.scala
View File

@ -12,7 +12,7 @@ object Dependencies {
sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
// sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.10.4")
private val ioVersion = nightlyVersion.getOrElse("1.10.5")
private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.10.4")
val zincVersion = nightlyVersion.getOrElse("1.10.8")