From 40ab6337c2f84d85a80d150bf55f9e8a202adcc6 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Thu, 24 Oct 2013 00:04:18 +0200 Subject: cross-build for sbt 0.13, fixes #8 --- src/main/scala/spray/boilerplate/BoilerplatePlugin.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/scala/spray/boilerplate') diff --git a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala index 6049c98..149192c 100644 --- a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala +++ b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala @@ -38,7 +38,7 @@ object BoilerplatePlugin extends Plugin { def watch(sourceDirKey: SettingKey[File], filterKey: SettingKey[FileFilter], excludeKey: SettingKey[FileFilter]) = watchSources <++= (sourceDirKey, filterKey, excludeKey) map descendents def descendents(sourceDir: File, filt: FileFilter, excl: FileFilter) = - sourceDir.descendentsExcept(filt, excl).get + descendantsExcept(sourceDir, filt, excl).get def generateFromTemplates(streams: TaskStreams, sourceDir: File, targetDir: File): Seq[File] = { val files = sourceDir ** "*.template" @@ -65,4 +65,7 @@ object BoilerplatePlugin extends Plugin { mapping.map(_._2) } } + + def descendantsExcept(path: PathFinder, include: FileFilter, intermediateExclude: FileFilter): PathFinder = + (path ** include) --- (path ** intermediateExclude ** include) } -- cgit v1.2.3