From 112c61e2aa8fdb7dbfe803fd458780ab0a9540db Mon Sep 17 00:00:00 2001
From: Martin Grotzke <martin.grotzke@googlemail.com>
Date: Thu, 3 Nov 2016 00:20:47 +0100
Subject: [PATCH] Update sbt to 0.13.13, fix deprecation warnings

See also [sbt 0.13.13 release notes](http://www.scala-sbt.org/0.13/docs/sbt-0.13-Tech-Previews.html#Deprecate+old+sbt+0.12+DSL)
and the original sbt PR sbt/sbt#2711.

Closes #351
---
 project/ProjectSettings.scala | 29 +++++++++++++++--------------
 project/build.properties      |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala
index 1472d490..23e04b74 100644
--- a/project/ProjectSettings.scala
+++ b/project/ProjectSettings.scala
@@ -78,24 +78,25 @@ object ProjectSettings {
   // ----------------------------------------------------------------------
 
   lazy val integrationTestSingleNodeSettings = Defaults.itSettings ++ Seq(
-    createHeaders in IntegrationTest <<= (createHeaders in IntegrationTest) triggeredBy (createHeaders in Test),
-    compile in IntegrationTest <<= (compile in IntegrationTest) triggeredBy (compile in Test),
-    test in IntegrationTest <<= (test in IntegrationTest) triggeredBy (test in Test),
+    createHeaders in IntegrationTest := ((createHeaders in IntegrationTest) triggeredBy (createHeaders in Test)).value,
+    compile in IntegrationTest := ((compile in IntegrationTest) triggeredBy (compile in Test)).value,
+    test in IntegrationTest := ((test in IntegrationTest) triggeredBy (test in Test)).value,
     parallelExecution in IntegrationTest := false,
     fork in IntegrationTest := true
   )
 
   lazy val integrationTestMultiNodeSettings = SbtMultiJvm.multiJvmSettings ++ Seq(
-    createHeaders in MultiJvm <<= (createHeaders in MultiJvm) triggeredBy (createHeaders in Test),
-    compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test),
-    executeTests in Test <<= (executeTests in Test, executeTests in MultiJvm) map {
-      case (testResults, multiJvmResults) =>
-        val overall =
-          if (testResults.overall.id < multiJvmResults.overall.id) multiJvmResults.overall
-          else testResults.overall
-        Tests.Output(overall,
-          testResults.events ++ multiJvmResults.events,
-          testResults.summaries ++ multiJvmResults.summaries)
+    createHeaders in MultiJvm := ((createHeaders in MultiJvm) triggeredBy (createHeaders in Test)).value,
+    compile in MultiJvm := ((compile in MultiJvm) triggeredBy (compile in Test)).value,
+    executeTests in Test := {
+      val testResults = (executeTests in Test).value
+      val multiJvmResults = (executeTests in MultiJvm).value
+      val overall =
+        if (testResults.overall.id < multiJvmResults.overall.id) multiJvmResults.overall
+        else testResults.overall
+      Tests.Output(overall,
+        testResults.events ++ multiJvmResults.events,
+        testResults.summaries ++ multiJvmResults.summaries)
     }
   )
 
@@ -179,7 +180,7 @@ object ProjectSettings {
     lazy val generateClasspath = taskKey[Unit]("generate example classpath script")
 
     Seq(
-      generateClasspath <<= generateClasspath.dependsOn(sbt.Keys.compile in Test),
+      generateClasspath := (generateClasspath dependsOn (sbt.Keys.compile in Test)).value,
       generateClasspath := {
         val cpaths = (fullClasspath in Compile).value.map(_.data).mkString(":")
         val output =
diff --git a/project/build.properties b/project/build.properties
index 43b8278c..27e88aa1 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13