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

[2.x] fix: Fixes pollInterval (#9020) 

**Problem/Solution**
checkBuildSources / pollInterval should just fallback to some value.
This commit is contained in:
eugene yokota 2026-04-05 00:52:29 -04:00 committed by Eugene Yokota
parent 5469e046fa
commit c89f14caa1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/Defaults.scala
View File

@ -420,6 +420,7 @@ object Defaults extends BuildCommon {
terminal := Def.uncached(state.value.get(terminalKey).getOrElse(Terminal(ITerminal.get))), terminal := Def.uncached(state.value.get(terminalKey).getOrElse(Terminal(ITerminal.get))),
InstallSbtn.installSbtn := InstallSbtn.installSbtnImpl.evaluated, InstallSbtn.installSbtn := InstallSbtn.installSbtnImpl.evaluated,
InstallSbtn.installSbtn / aggregate := false, InstallSbtn.installSbtn / aggregate := false,
checkBuildSources / pollInterval :== CheckBuildSources.defaultPollInterval,
) ++ LintUnused.lintSettings ) ++ LintUnused.lintSettings
++ DefaultBackgroundJobService.backgroundJobServiceSettings ++ DefaultBackgroundJobService.backgroundJobServiceSettings
++ RemoteCache.globalSettings ++ RemoteCache.globalSettings
@ -555,8 +556,6 @@ object Defaults extends BuildCommon {
sourceManaged := target.value / "src_managed", sourceManaged := target.value / "src_managed",
resourceManaged := target.value / "resource_managed", resourceManaged := target.value / "resource_managed",
// Adds subproject build.sbt files to the global list of build files to monitor // Adds subproject build.sbt files to the global list of build files to monitor
Scope.Global / checkBuildSources / pollInterval :==
new FiniteDuration(Int.MinValue, TimeUnit.MILLISECONDS),
Scope.Global / checkBuildSources / fileInputs ++= { Scope.Global / checkBuildSources / fileInputs ++= {
if ((Scope.Global / onChangedBuildSource).value != IgnoreSourceChanges) if ((Scope.Global / onChangedBuildSource).value != IgnoreSourceChanges)
Seq(baseDirectory.value.toGlob / "*.sbt") Seq(baseDirectory.value.toGlob / "*.sbt")

11
main/src/main/scala/sbt/nio/CheckBuildSources.scala
View File

@ -10,6 +10,7 @@ package sbt
package internal.nio package internal.nio
import java.nio.file.Path import java.nio.file.Path
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference } import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
import sbt.BasicCommandStrings.{ RebootCommand, Shutdown, TerminateAction } import sbt.BasicCommandStrings.{ RebootCommand, Shutdown, TerminateAction }
import sbt.Keys.{ baseDirectory, pollInterval, state } import sbt.Keys.{ baseDirectory, pollInterval, state }
@ -65,7 +66,9 @@ private[sbt] class CheckBuildSources extends AutoCloseable {
} }
private def reset(state: State): Unit = { private def reset(state: State): Unit = {
val extracted = Project.extract(state) val extracted = Project.extract(state)
val interval = extracted.get(checkBuildSources / pollInterval) val interval = extracted
.getOpt(checkBuildSources / pollInterval)
.getOrElse(CheckBuildSources.defaultPollInterval)
val newSources = extracted.get(Global / checkBuildSources / fileInputs).distinct val newSources = extracted.get(Global / checkBuildSources / fileInputs).distinct
if (interval >= 0.seconds || "polling" == SysProp.watchMode) { if (interval >= 0.seconds || "polling" == SysProp.watchMode) {
Option(repository.getAndSet(null)).foreach(_.close()) Option(repository.getAndSet(null)).foreach(_.close())
@ -174,7 +177,9 @@ private[sbt] class CheckBuildSources extends AutoCloseable {
override def close(): Unit = {} override def close(): Unit = {}
} }
private[sbt] object CheckBuildSources { private[sbt] object CheckBuildSources:
val defaultPollInterval: FiniteDuration = FiniteDuration(Int.MinValue, TimeUnit.MILLISECONDS)
private[sbt] val CheckBuildSourcesKey = private[sbt] val CheckBuildSourcesKey =
AttributeKey[CheckBuildSources]("check-build-source", "", KeyRanks.Invisible) AttributeKey[CheckBuildSources]("check-build-source", "", KeyRanks.Invisible)
/* /*
@ -219,4 +224,4 @@ private[sbt] object CheckBuildSources {
projectGlobs(projectDir, baseDir.toGlob / "*.sbt" :: Nil) projectGlobs(projectDir, baseDir.toGlob / "*.sbt" :: Nil)
} else Nil } else Nil
} }
} end CheckBuildSources