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

fix: Use Retry.io for compilation 

**Problem**
sbt 1.10.10 still has retry problem with compilation.

**Solution**
Revert the retry logic back to the time when we only retried IOExceptions.
This commit is contained in:
Eugene Yokota 2025-03-16 21:43:01 -04:00
parent 75536d12a5
commit 12d2cc8ef1
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")