From 12d2cc8ef1f3dc11899baac70f4bc918e925edc3 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 16 Mar 2025 21:43:01 -0400 Subject: [PATCH] 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. --- main/src/main/scala/sbt/internal/server/BspCompileTask.scala | 3 +-- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala index ed784f244..b2aed4e55 100644 --- a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala +++ b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala @@ -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 { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8831a5d4c..f3ef989a2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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")