update sbt 0.13.15. fix warnings

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.15

src/main/scala/com/typesafe/sbt/site/SitePlugin.scala

@@ -15,14 +15,14 @@ object SitePlugin extends AutoPlugin {
 
   override lazy val projectSettings = Seq(
     siteMappings := Seq.empty,
-    siteMappings <<= siteMappings ?? Seq.empty,
+    siteMappings := (siteMappings ?? Seq.empty).value,
     siteDirectory := target.value / "site",
     siteSourceDirectory := sourceDirectory.value / "site",
     includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf",
     siteMappings ++= SiteHelpers.selectSubpaths(siteSourceDirectory.value, (includeFilter in makeSite).value),
     makeSite := SiteHelpers.copySite(siteDirectory.value, streams.value.cacheDirectory, siteMappings.value),
     artifact in packageSite := SiteHelpers.siteArtifact(moduleName.value),
-    artifactPath in packageSite <<= Defaults.artifactPathSetting(artifact in packageSite),
+    artifactPath in packageSite := Defaults.artifactPathSetting(artifact in packageSite).value,
     packageSite := SiteHelpers.createSiteZip(makeSite.value, (artifactPath in packageSite).value, streams.value)
   )
 }

src/main/scala/com/typesafe/sbt/site/laika/LaikaSitePlugin.scala

@@ -42,7 +42,7 @@ object LaikaSitePlugin extends AutoPlugin {
         SiteHelpers.watchSettings(config) ++
         SiteHelpers.addMappingsToSiteDir(mappings in config, siteSubdirName in config) ++
         Seq(
-          makeSite <<= makeSite.dependsOn(LaikaKeys.html in LaikaKeys.Laika)
+          makeSite := makeSite.dependsOn(LaikaKeys.html in LaikaKeys.Laika).value
         )
 
   private def generate(target: File, inc: FileFilter, exc: FileFilter): Seq[(File, String)] = {

src/main/scala/com/typesafe/sbt/site/sphinx/SphinxPlugin.scala

@@ -32,18 +32,18 @@ object SphinxPlugin extends AutoPlugin {
         enableOutput in generateHtml := true,
         enableOutput in generatePdf := false,
         enableOutput in generateEpub := false,
-        generateHtml <<= generateHtmlTask,
-        generatePdf <<= generatePdfTask,
-        generateEpub <<= generateEpubTask,
-        generatedHtml <<= ifEnabled(generateHtml),
-        generatedPdf <<= seqIfEnabled(generatePdf),
-        generatedEpub <<= ifEnabled(generateEpub),
-        generate <<= generateTask,
+        generateHtml := generateHtmlTask.value,
+        generatePdf := generatePdfTask.value,
+        generateEpub := generateEpubTask.value,
+        generatedHtml := ifEnabled(generateHtml).value,
+        generatedPdf := seqIfEnabled(generatePdf).value,
+        generatedEpub := ifEnabled(generateEpub).value,
+        generate := generateTask.value,
         includeFilter in Sphinx := AllPassFilter,
-        mappings <<= mappingsTask,
+        mappings := mappingsTask.value,
         // For now, we default to passing the version in as a property.
         sphinxProperties ++= defaultVersionProperties(version.value),
-        sphinxEnv <<= defaultEnvTask,
+        sphinxEnv := defaultEnvTask.value,
         siteSubdirName := ""
       )
     ) ++
@@ -67,8 +67,16 @@ object SphinxPlugin extends AutoPlugin {
     packages map { p => runner.installPackage(p, target.value, s.log) }
   }
 
-  def combineSphinxInputs = {
-    (sourceDirectory, includeFilter in generate, excludeFilter in generate, sphinxIncremental, sphinxTags, sphinxProperties, sphinxEnv) map SphinxInputs
+  def combineSphinxInputs = Def.task {
+    SphinxInputs(
+      sourceDirectory.value,
+      (includeFilter in generate).value,
+      (excludeFilter in generate).value,
+      sphinxIncremental.value,
+      sphinxTags.value,
+      sphinxProperties.value,
+      sphinxEnv.value
+    )
   }
 
   def generateHtmlTask = Def.task {
@@ -103,9 +111,9 @@ object SphinxPlugin extends AutoPlugin {
   private[this] def ifEnabled0[S, T](
     key: TaskKey[S],
     f: Task[S] => Task[T],
-    nil: T): Def.Initialize[Task[T]] = (enableOutput in key in key.scope, key.task) flatMap {
-    (enabled, enabledTask) => if (enabled) f(enabledTask) else task {nil}
-  }
+    nil: T): Def.Initialize[Task[T]] = Def.task{
+    if ((enableOutput in key in key.scope).value) f(key.taskValue) else task {nil}
+  }.flatMap(identity)
 
   def generateTask = Def.task {
     val htmlOutput = generatedHtml.value

src/main/scala/com/typesafe/sbt/site/util/SiteHelpers.scala

@@ -14,8 +14,8 @@ object SiteHelpers {
   def addMappingsToSiteDir(
     mappings: TaskKey[Seq[(File, String)]],
     nestedDirectory: SettingKey[String]): Setting[_] =
-    siteMappings <++= (mappings, nestedDirectory) map { (m, n) =>
-      for ((f, d) <- m) yield (f, n + "/" + d)
+    siteMappings ++= {
+      for ((f, d) <- mappings.value) yield (f, nestedDirectory.value + "/" + d)
     }
 
   def selectSubpaths(dir: File, filter: FileFilter): Seq[(File, String)] =
@@ -43,7 +43,7 @@ object SiteHelpers {
       ))
   def watchSettings(config: Configuration): Seq[Setting[_]] =
     Seq(
-      watchSources in Global <++= (sourceDirectory in config) map {_.***.get}
+      watchSources in Global ++= (sourceDirectory in config).value.***.get
     )
 
 

src/sbt-test/site/plays-nice-with-tut/build.sbt

@@ -5,7 +5,7 @@ enablePlugins(ParadoxSitePlugin)
 
 tutSettings
 sourceDirectory in Paradox := tutTargetDirectory.value
-makeSite <<= makeSite.dependsOn(tut)
+makeSite := makeSite.dependsOn(tut).value
 //#tut
 
 TaskKey[Unit]("checkContent") := {