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

Revert Defaults.collectFiles 

Fixes #4681
Ref #4649
This commit is contained in:
Eugene Yokota 2019-05-25 13:10:17 -04:00
parent 90af7a46c1
commit 5936bd1ff2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,15 +1242,12 @@ object Defaults extends BuildCommon {
} }
def collectFiles( def collectFiles(
dirs: ScopedTaskable[Seq[File]], dirs: ScopedTaskable[Seq[File]],
include: ScopedTaskable[FileFilter], filter: ScopedTaskable[FileFilter],
exclude: ScopedTaskable[FileFilter] excludes: ScopedTaskable[FileFilter]
): Initialize[Task[Seq[File]]] = Def.task { ): Initialize[Task[Seq[File]]] =
val filter = include.toTask.value -- exclude.toTask.value Def.task {
val view = fileTreeView.value dirs.toTask.value.descendantsExcept(filter.toTask.value, excludes.toTask.value).get
view.list(dirs.toTask.value.map(f => Globs(f.toPath, recursive = true, filter))).collect {
case (p, a) if !a.isDirectory => p.toFile
} }
}
def artifactPathSetting(art: SettingKey[Artifact]): Initialize[File] = def artifactPathSetting(art: SettingKey[Artifact]): Initialize[File] =
Def.setting { Def.setting {
val f = artifactName.value val f = artifactName.value