From 2e8c98f1a4aac89791d80284191c34e606ac2678 Mon Sep 17 00:00:00 2001 From: j-keck Date: Sun, 23 Nov 2014 14:09:22 +0100 Subject: [PATCH 1/3] filter out hidden files --- main/src/main/scala/sbt/Load.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Load.scala b/main/src/main/scala/sbt/Load.scala index 466538725..7ac5ca259 100755 --- a/main/src/main/scala/sbt/Load.scala +++ b/main/src/main/scala/sbt/Load.scala @@ -723,8 +723,8 @@ object Load { // Finds all the build files associated with this project import AddSettings.{ User, SbtFiles, DefaultSbtFiles, Plugins, AutoPlugins, Sequence, BuildScalaFiles } def associatedFiles(auto: AddSettings): Seq[File] = auto match { - case sf: SbtFiles => sf.files.map(f => IO.resolve(projectBase, f)) - case sf: DefaultSbtFiles => defaultSbtFiles.filter(sf.include) + case sf: SbtFiles => sf.files.map(f => IO.resolve(projectBase, f)).filterNot(_.isHidden) + case sf: DefaultSbtFiles => defaultSbtFiles.filter(sf.include).filterNot(_.isHidden) case q: Sequence => (Seq.empty[File] /: q.sequence) { (b, add) => b ++ associatedFiles(add) } case _ => Seq.empty } From 2624e3aad66bfbaec07c66942a9494c65cb2828d Mon Sep 17 00:00:00 2001 From: j-keck Date: Tue, 25 Nov 2014 09:54:42 +0100 Subject: [PATCH 2/3] add scripted test --- .../ignore-hidden-build-files/changes/invalid-build.sbt | 1 + sbt/src/sbt-test/project/ignore-hidden-build-files/test | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 sbt/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt create mode 100644 sbt/src/sbt-test/project/ignore-hidden-build-files/test diff --git a/sbt/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt b/sbt/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt new file mode 100644 index 000000000..90e2eb0f4 --- /dev/null +++ b/sbt/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt @@ -0,0 +1 @@ +invalid build file content diff --git a/sbt/src/sbt-test/project/ignore-hidden-build-files/test b/sbt/src/sbt-test/project/ignore-hidden-build-files/test new file mode 100644 index 000000000..cb6d14648 --- /dev/null +++ b/sbt/src/sbt-test/project/ignore-hidden-build-files/test @@ -0,0 +1,6 @@ +# create a invalid .build.sbt file +# - note the dot - it's a hidden file +$ copy-file changes/invalid-build.sbt .build.sbt + +# trigger a reload - sbt should ignore the hidden build file +> reload From 928de373cd902b112b84cbf9f4e96f3d06b2f497 Mon Sep 17 00:00:00 2001 From: j-keck Date: Tue, 25 Nov 2014 09:57:25 +0100 Subject: [PATCH 3/3] update notes --- notes/0.13.8.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notes/0.13.8.markdown b/notes/0.13.8.markdown index b2bc55da7..c04eb76b5 100644 --- a/notes/0.13.8.markdown +++ b/notes/0.13.8.markdown @@ -1,10 +1,12 @@ [@jsuereth]: https://github.com/jsuereth [@kretes]: https://github.com/kretes +[@j-keck]: https://github.com/j-keck [1180]: https://github.com/sbt/sbt/issues/1180 [1180]: https://github.com/sbt/sbt/pull/1702 [875]: https://github.com/sbt/sbt/issues/875 [1542]: https://github.com/sbt/sbt/issues/1542 [1702]: https://github.com/sbt/sbt/pull/1702 +[1746]: https://github.com/sbt/sbt/pull/1746 ### Improvements @@ -15,3 +17,4 @@ - Javac warnings now always treated as warnings. [#1702][1702]/[#875][875] by [@jsuereth][jsuereth] - compilerReporter now fed to javac during incremental compilation. [#1542][1542] by [@jsuereth][jsuereth] +- ignore hidden build files from the build. [#1746][1746] by [@j-keck][@j-keck] \ No newline at end of file