From 74ddcf55ccf0fb4c87b4b0ea06f95a6a419f262f Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 27 Apr 2016 09:34:52 -0400 Subject: move soure file filterin logic into library for reusability --- stage2/BasicBuild.scala | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'stage2/BasicBuild.scala') diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 9f9dbdc..46f9d5a 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -63,16 +63,10 @@ class Build(val context: Context) extends Dependency with TriggerLoop with SbtDe def compileStatusFile: File = compileTarget ++ ".last-success" /** Source directories and files. Defaults to .scala and .java files in src/ and top-level. */ - def sources: Seq[File] = Seq(defaultSourceDirectory) ++ projectDirectory.listFiles.toVector.filter(sourceFileFilter) - - /** Which file endings to consider being source files. */ - def sourceFileFilter(file: File): Boolean = file.toString.endsWith(".scala") || file.toString.endsWith(".java") + def sources: Seq[File] = Seq(defaultSourceDirectory) ++ projectDirectory.listFiles.toVector.filter(lib.sourceFileFilter) /** Absolute path names for all individual files found in sources directly or contained in directories. */ - final def sourceFiles: Seq[File] = for { - base <- sources.filter(_.exists).map(lib.realpath) - file <- lib.listFilesRecursive(base) if file.isFile && sourceFileFilter(file) - } yield file + final def sourceFiles: Seq[File] = lib.sourceFiles(sources) protected def assertSourceDirectories(): Unit = { val nonExisting = -- cgit v1.2.3