Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop injecting file management settings for io tasks #4980

Merged
merged 1 commit into from Aug 23, 2019
Merged

Stop injecting file management settings for io tasks #4980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions main/src/main/scala/sbt/Defaults.scala
View file
Open in desktop
Expand Up @@ -415,7 +415,6 @@ object Defaults extends BuildCommon {
},
unmanagedSources := (unmanagedSources / inputFileStamps).value.map(_._1.toFile),
managedSourceDirectories := Seq(sourceManaged.value),
managedSources / outputFileStamper := sbt.nio.FileStamper.Hash,
managedSources := {
val stamper = inputFileStamper.value
val cache = managedFileStampCache.value
Expand All @@ -425,6 +424,8 @@ object Defaults extends BuildCommon {
}
res
},
managedSourcePaths / outputFileStamper := sbt.nio.FileStamper.Hash,
managedSourcePaths := managedSources.value.map(_.toPath),
sourceGenerators :== Nil,
sourceDirectories := Classpaths
.concatSettings(unmanagedSourceDirectories, managedSourceDirectories)
Expand Down Expand Up @@ -618,7 +619,7 @@ object Defaults extends BuildCommon {
externalHooks := {
import sbt.nio.FileStamp.Formats.seqPathFileStampJsonFormatter
val currentInputs =
(unmanagedSources / inputFileStamps).value ++ (managedSources / outputFileStamps).value
(unmanagedSources / inputFileStamps).value ++ (managedSourcePaths / outputFileStamps).value
val previousInputs = (externalHooks / inputFileStamps).previous
val inputChanges = previousInputs
.map(sbt.nio.Settings.changedFiles(_, currentInputs))
Expand All @@ -632,7 +633,7 @@ object Defaults extends BuildCommon {
},
externalHooks / inputFileStamps := {
compile.value // ensures the inputFileStamps previous value is only set if compile succeeds.
(unmanagedSources / inputFileStamps).value ++ (managedSources / outputFileStamps).value
(unmanagedSources / inputFileStamps).value ++ (managedSourcePaths / outputFileStamps).value
},
externalHooks / inputFileStamps := (externalHooks / inputFileStamps).triggeredBy(compile).value,
externalHooks / outputFileStamps := {
Expand Down
3 changes: 3 additions & 0 deletions main/src/main/scala/sbt/nio/Keys.scala
View file
Open in desktop
Expand Up @@ -160,6 +160,9 @@ object Keys {
private[sbt] val managedFileStampCache = taskKey[FileStamp.Cache](
"Map of managed file stamps that may be cleared between task evaluation runs."
).withRank(Invisible)
private[sbt] val managedSourcePaths =
taskKey[Seq[Path]]("Transforms the managedSources to Seq[Path] to induce setting injection.")
.withRank(Invisible)
private[sbt] val dependencyClasspathFiles =
taskKey[Seq[Path]]("The dependency classpath for a task.").withRank(Invisible)
private[sbt] val classpathFiles =
Expand Down
4 changes: 0 additions & 4 deletions main/src/main/scala/sbt/nio/Settings.scala
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
package sbt
package nio

import java.io.File
import java.nio.file.{ Files, Path }
import java.util.concurrent.ConcurrentHashMap

Expand Down Expand Up @@ -82,11 +81,9 @@ private[sbt] object Settings {
ak.manifest.typeArguments match {
case t :: Nil if seqClass.isAssignableFrom(t.runtimeClass) =>
t.typeArguments match {
case f :: Nil if fileClass.isAssignableFrom(f.runtimeClass) => mkSetting[Seq[File]]
case p :: Nil if pathClass.isAssignableFrom(p.runtimeClass) => mkSetting[Seq[Path]]
case _ => default
}
case t :: Nil if fileClass.isAssignableFrom(t.runtimeClass) => mkSetting[File]
case t :: Nil if pathClass.isAssignableFrom(t.runtimeClass) => mkSetting[Path]
case _ => default
}
Expand Down Expand Up @@ -147,7 +144,6 @@ private[sbt] object Settings {

private[this] val taskClass = classOf[Task[_]]
private[this] val seqClass = classOf[Seq[_]]
private[this] val fileClass = classOf[java.io.File]
private[this] val pathClass = classOf[java.nio.file.Path]

/**
Expand Down