1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
index 88e6661..50bcfd5 100644
--- a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
+++ b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
@@ -31,13 +31,12 @@ object BoilerplatePlugin extends AutoPlugin {
       boilerplateSignature := "// auto-generated by sbt-boilerplate\n")
 
   private def rawBoilerplateSettings: Seq[Setting[_]] = {
-    val inputFilter = "*.template"
-    Seq(
-      boilerplateSource := sourceDirectory.value / "boilerplate",
-      watchSources in Defaults.ConfigGlobal ++= ((boilerplateSource.value ** inputFilter) --- (boilerplateSource.value ** excludeFilter.value ** inputFilter)).get,
-      boilerplateGenerate := generateFromTemplates(streams.value, boilerplateSignature.value, boilerplateSource.value, sourceManaged.value),
-      mappings in packageSrc ++= managedSources.value pair (Path.relativeTo(sourceManaged.value) | Path.flat),
-      sourceGenerators <+= boilerplateGenerate)
+    Compat.watchSourceSettings ++
+      Seq(
+        boilerplateSource := sourceDirectory.value / "boilerplate",
+        boilerplateGenerate := generateFromTemplates(streams.value, boilerplateSignature.value, boilerplateSource.value, sourceManaged.value),
+        mappings in packageSrc ++= managedSources.value pair (Path.relativeTo(sourceManaged.value) | Path.flat),
+        sourceGenerators += boilerplateGenerate)
   }
 
   def generateFromTemplates(streams: TaskStreams, signature: String, sourceDir: File, targetDir: File): Seq[File] = {
@@ -53,7 +52,7 @@ object BoilerplatePlugin extends AutoPlugin {
       new File(f.getParent, newName)
     }
 
-    val mapping = (files pair rebase(sourceDir, targetDir)).map {
+    val mapping = (files pair Path.rebase(sourceDir, targetDir)).map {
       case (orig, target) ⇒ (orig, changeExtension(target))
     }
 
@@ -87,12 +86,12 @@ object BoilerplatePlugin extends AutoPlugin {
     }
 
     val toRemove =
-      targetDir.***
+      Compat.allPaths(targetDir)
         // apply filters with increasing effort
         .filter(f ⇒ f.exists && f.isFile)
         .filter(_.length >= signature.length)
         .filter(!fileSet(_))
-        .filter(containsSignature)
+        .filter(containsSignature _)
         .get
 
     toRemove.foreach { f ⇒