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

Do not append default watch sources with ++= 

Using ++= prevents these from being overridden by the user without doing
some nasty runtime manipulations.
This commit is contained in:
Ethan Atkins 2018-08-20 12:55:17 -07:00
parent 97598efcea
commit 5e3f72ad8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,7 @@ object Defaults extends BuildCommon {
includeFilter in unmanagedSources,
excludeFilter in unmanagedSources
).value,
watchSources in ConfigGlobal ++= {
watchSources in ConfigGlobal := (watchSources in ConfigGlobal).value ++ {
val baseDir = baseDirectory.value
val bases = unmanagedSourceDirectories.value
val include = (includeFilter in unmanagedSources).value
@ -398,7 +398,7 @@ object Defaults extends BuildCommon {
includeFilter in unmanagedResources,
excludeFilter in unmanagedResources
).value,
watchSources in ConfigGlobal ++= {
watchSources in ConfigGlobal := (watchSources in ConfigGlobal).value ++ {
val bases = unmanagedResourceDirectories.value
val include = (includeFilter in unmanagedResources).value
val exclude = (excludeFilter in unmanagedResources).value