From ee326960c21b21c0f4f840fbd6380b9788daba2d Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 20 Apr 2017 10:45:36 +0200 Subject: [PATCH] fix compilation error in multi-jvm tests * it was not detected by PR validation because of bug in sbt 0.13.13, <<= operator with triggeredBy * updated to sbt 0.13.15 --- akka-docs-new/build.sbt | 2 +- .../scala/akka/remote/artery/BenchmarkFileReporter.scala | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-docs-new/build.sbt b/akka-docs-new/build.sbt index b84b092a69..70a54a1210 100644 --- a/akka-docs-new/build.sbt +++ b/akka-docs-new/build.sbt @@ -7,7 +7,7 @@ AkkaBuild.dontPublishSettings Formatting.docFormatSettings Dependencies.docs -unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test +unmanagedSourceDirectories in ScalariformKeys.format in Test := (unmanagedSourceDirectories in Test).value //TODO: additionalTasks in ValidatePR += paradox in Paradox enablePlugins(ScaladocNoVerificationOfDiagrams) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala index b8835eb88d..9e9c997541 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala @@ -4,7 +4,7 @@ package akka.remote.artery import java.io.File -import java.nio.Files +import java.nio.file.Files import java.text.SimpleDateFormat import java.util.Date diff --git a/project/build.properties b/project/build.properties index 27e88aa115..64317fdae5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=0.13.15