From 2bb717dbf97f94bdc6d7259654757dea2a278b35 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 11 Apr 2018 18:51:53 -0700 Subject: [PATCH] Exclude directories instead of including files The existing filter caused SourceModificationWatch.watch to ignore deleted files because !file.exists implies !file.isFile. The intention of the filter was to exclude directories that had a name ending in ".scala". --- main/src/main/scala/sbt/Defaults.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index c631ff114..82af2a9e4 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -162,8 +162,7 @@ object Defaults extends BuildCommon { artifactClassifier in packageSrc :== Some(SourceClassifier), artifactClassifier in packageDoc :== Some(DocClassifier), includeFilter :== NothingFilter, - includeFilter in unmanagedSources :== ("*.java" | "*.scala") && new SimpleFileFilter( - _.isFile), + includeFilter in unmanagedSources :== ("*.java" | "*.scala") -- DirectoryFilter, includeFilter in unmanagedJars :== "*.jar" | "*.so" | "*.dll" | "*.jnilib" | "*.zip", includeFilter in unmanagedResources :== AllPassFilter, bgList := { bgJobService.value.jobs },