Translate sbt-mustache plugin to SBT 0.13 task macro syntax

untyped · Jan 14, 2016 · 39fc43c · 39fc43c
1 parent 6dd1151
commit 39fc43c
Showing 1 changed file with 55 additions and 41 deletions.
diff --git a/sbt-mustache/src/main/scala/com/untyped/sbtmustache/Plugin.scala b/sbt-mustache/src/main/scala/com/untyped/sbtmustache/Plugin.scala
@@ -18,55 +18,69 @@ object Plugin extends sbt.Plugin {
 
   import MustacheKeys._
 
-  def unmanagedSourcesTask = // : Def.Initialize[Task[Seq[File]]] =
-    (streams, sourceDirectories in mustache, includeFilter in mustache, excludeFilter in mustache) map {
-      (out, sourceDirs, includeFilter, excludeFilter) =>
-        out.log.debug("sourceDirectories: " + sourceDirs)
-        out.log.debug("includeFilter: " + includeFilter)
-        out.log.debug("excludeFilter: " + excludeFilter)
-
-        sourceDirs.foldLeft(Seq[File]()) {
-          (accum, sourceDir) =>
-            accum ++ com.untyped.sbtgraph.Descendents(sourceDir, includeFilter, excludeFilter).get
-        }
+  def unmanagedSourcesTask = Def.task {
+    val _out           = (streams).value
+    val _sourceDirs    = (sourceDirectories in mustache).value
+    val _includeFilter = (includeFilter in mustache).value
+    val _excludeFilter = (excludeFilter in mustache).value
+
+    _out.log.debug("sourceDirectories: " + _sourceDirs)
+    _out.log.debug("includeFilter: " + _includeFilter)
+    _out.log.debug("excludeFilter: " + _excludeFilter)
+
+    _sourceDirs.foldLeft(Seq[File]()) { (accum, sourceDir) =>
+      import com.untyped.sbtgraph.Descendents
+
+      accum ++ Descendents(sourceDir, _includeFilter, _excludeFilter).get
     }
+  }
 
-  def sourceGraphTask = // : Def.Initialize[Task[Graph]] =
-    (streams, sourceDirectories in mustache, resourceManaged in mustache, unmanagedSources in mustache, templateProperties, downloadDirectory, filenameSuffix) map {
-      (out, sourceDirs, targetDir, sourceFiles, templateProperties, downloadDir, filenameSuffix) =>
-        out.log.debug("sbt-mustache template properties " + templateProperties)
+  def sourceGraphTask = Def.task {
+    val _out                = (streams).value
+    val _sourceDirs         = (sourceDirectories in mustache).value
+    val _targetDir          = (resourceManaged in mustache).value
+    val _sourceFiles        = (unmanagedSources in mustache).value
+    val _templateProperties = (templateProperties).value
+    val _downloadDir        = (downloadDirectory).value
+    val _filenameSuffix     = (filenameSuffix).value
+
+    _out.log.debug("sbt-mustache template properties " + _templateProperties)
+
+    val graph = Graph(
+      log                = _out.log,
+      sourceDirs         = _sourceDirs,
+      targetDir          = _targetDir,
+      templateProperties = _templateProperties,
+      downloadDir        = _downloadDir,
+      filenameSuffix     = _filenameSuffix
+    )
 
-        val graph = Graph(
-          log                = out.log,
-          sourceDirs         = sourceDirs,
-          targetDir          = targetDir,
-          templateProperties = templateProperties,
-          downloadDir        = downloadDir,
-          filenameSuffix     = filenameSuffix
-        )
+    _sourceFiles.foreach(graph +=)
 
-        sourceFiles.foreach(graph +=)
+    graph
+  }
 
-        graph
-    }
+  def watchSourcesTask = Def.task {
+    val _out   = (streams).value
+    val _graph = (sourceGraph in mustache).value
 
-  def watchSourcesTask = // : Def.Initialize[Task[Seq[File]]] =
-    (streams, sourceGraph in mustache) map {
-      (out, graph) =>
-        graph.sources.map(_.src) : Seq[File]
-    }
+    _graph.sources.map(_.src) : Seq[File]
+  }
 
-  def compileTask =
-    (streams, unmanagedSources in mustache, sourceGraph in mustache) map {
-      (out, sourceFiles, graph: Graph) =>
-        graph.compileAll(sourceFiles)
-    }
+  def compileTask = Def.task {
+    val _out         = (streams).value
+    val _sourceFiles = (unmanagedSources in mustache).value
+    val _graph       = (sourceGraph in mustache).value
 
-  def cleanTask =
-    (streams, sourceGraph in mustache) map {
-      (out, graph) =>
-        graph.sources.foreach(_.clean())
-    }
+    _graph.compileAll(_sourceFiles)
+  }
+
+  def cleanTask = Def.task {
+    val _out   = (streams).value
+    val _graph = (sourceGraph in mustache).value
+
+    _graph.sources.foreach(_.clean())
+  }
 
   def mustacheSettingsIn(conf: Configuration): Seq[Setting[_]] =
     inConfig(conf)(Seq(