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

[2.0.x] fix: Avoid updateFull 

**Problem**
updateFull is called in no-op compile.

**Solution**
Avoid it for the default dependency mode.
This commit is contained in:
Eugene Yokota 2026-06-01 06:36:19 -04:00
parent 0ecc581256
commit 001fbf8e69
2 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2737,17 +2737,31 @@ object Classpaths {
dependencyMode.value match
case DependencyMode.Transitive =>
Def.task { dependencyClasspath.value }
case mode =>
case DependencyMode.Direct =>
Def.task {
val internalFiltered = ClasspathImpl.filterInternalByMode(
mode,
DependencyMode.Direct,
thisProjectRef.value,
settingsData.value,
buildDependencies.value,
internalDependencyClasspath.value,
)
val externalFiltered = ClasspathImpl.filterByDependencyMode(
mode,
val externalFiltered = ClasspathImpl.filterByDirectDeps(
allDependencies.value,
externalDependencyClasspath.value,
)
internalFiltered ++ externalFiltered
}
case DependencyMode.PlusOne =>
Def.task {
val internalFiltered = ClasspathImpl.filterInternalByMode(
DependencyMode.PlusOne,
thisProjectRef.value,
settingsData.value,
buildDependencies.value,
internalDependencyClasspath.value,
)
val externalFiltered = ClasspathImpl.filterByPlusOne(
allDependencies.value,
projectID.value,
classpathConfiguration.value,
@ -2815,28 +2829,46 @@ object Classpaths {
// Note: invoking this task from shell would block indefinitely because it will
// wait for the upstream compilation to start.
dependencyPicklePath := Def.uncached {
// This is a conditional task. Do not refactor.
if (incOptions.value.pipelining) {
val mode = dependencyMode.value
val internalFiltered = ClasspathImpl.filterInternalByMode(
mode,
thisProjectRef.value,
settingsData.value,
buildDependencies.value,
internalDependencyPicklePath.value,
)
val externalFiltered = ClasspathImpl.filterByDependencyMode(
mode,
allDependencies.value,
projectID.value,
classpathConfiguration.value,
updateFull.value,
externalDependencyClasspath.value,
)
internalFiltered ++ externalFiltered
} else {
filteredDependencyClasspath.value
}
Def.taskDyn {
(incOptions.value.pipelining, dependencyMode.value) match
case (false, _) =>
Def.task { filteredDependencyClasspath.value }
case (true, DependencyMode.Transitive) =>
Def.task { dependencyClasspath.value }
case (true, DependencyMode.Direct) =>
Def.task {
val internalFiltered = ClasspathImpl.filterInternalByMode(
DependencyMode.Direct,
thisProjectRef.value,
settingsData.value,
buildDependencies.value,
internalDependencyClasspath.value,
)
val externalFiltered = ClasspathImpl.filterByDirectDeps(
allDependencies.value,
externalDependencyClasspath.value,
)
internalFiltered ++ externalFiltered
}
case (true, DependencyMode.PlusOne) =>
Def.task {
val internalFiltered = ClasspathImpl.filterInternalByMode(
DependencyMode.PlusOne,
thisProjectRef.value,
settingsData.value,
buildDependencies.value,
internalDependencyClasspath.value,
)
val externalFiltered = ClasspathImpl.filterByPlusOne(
allDependencies.value,
projectID.value,
classpathConfiguration.value,
updateFull.value,
externalDependencyClasspath.value,
)
internalFiltered ++ externalFiltered
}
}.value
},
internalDependencyPicklePath := ClasspathImpl.internalDependencyPicklePathTask.value,
exportedPickles := ClasspathImpl.exportedPicklesTask.value,

2
main/src/main/scala/sbt/internal/ClasspathImpl.scala
View File

@ -577,7 +577,7 @@ private[sbt] object ClasspathImpl {
): Classpath =
mode match
case DependencyMode.Transitive => internalCp
case _ =>
case _ =>
val allowed = allowedInternalKeys(mode, projectRef, data, deps)
internalCp.filter: entry =>
entry.get(Keys.moduleIDStr) match