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

Remove unneeded filters

This commit is contained in:
Ethan Atkins 2019-04-17 17:29:05 -07:00
parent 51efa7bcc9
commit 41c63c1028
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ object Defaults extends BuildCommon {
artifactClassifier in packageSrc :== Some(SourceClassifier),
artifactClassifier in packageDoc :== Some(DocClassifier),
includeFilter :== NothingFilter,
includeFilter in unmanagedSources :== ("*.java" | "*.scala") -- DirectoryFilter,
includeFilter in unmanagedSources :== ("*.java" | "*.scala"),
includeFilter in unmanagedJars :== "*.jar" | "*.so" | "*.dll" | "*.jnilib" | "*.zip",
includeFilter in unmanagedResources :== AllPassFilter,
bgList := { bgJobService.value.jobs },
@ -250,10 +250,10 @@ object Defaults extends BuildCommon {
settingsData := buildStructure.value.data,
settingsData / fileInputs := {
val baseDir = file(".").getCanonicalFile
val sourceFilter = ("*.sbt" || "*.scala" || "*.java") -- HiddenFileFilter
val sourceFilter = ("*.sbt" || "*.scala" || "*.java")
val projectDir = baseDir / "project"
Seq(
baseDir * ("*.sbt" -- HiddenFileFilter),
baseDir * "*.sbt",
projectDir * sourceFilter,
// We only want to recursively look in source because otherwise we have to search
// the project target directories which is expensive.