From d6ebb4bc1e40b010055d2b9ca96c78dc5c520b1e Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 9 Nov 2016 14:06:48 +0000 Subject: [PATCH] Upgrade to sbt 0.13.13 (#56) --- project/Util.scala | 7 +++---- project/build.properties | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project/Util.scala b/project/Util.scala index 860d6c84b..adb7cef5b 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -1,6 +1,5 @@ import sbt._ import Keys._ -import StringUtilities.normalize object Util { lazy val scalaKeywords = TaskKey[Set[String]]("scala-keywords") @@ -9,7 +8,7 @@ object Util { lazy val javaOnlySettings = Seq[Setting[_]]( crossPaths := false, compileOrder := CompileOrder.JavaThenScala, - unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join, + unmanagedSourceDirectories in Compile := Seq((javaSource in Compile).value), crossScalaVersions := Seq(Dependencies.scala211), autoScalaLibrary := false ) @@ -35,7 +34,7 @@ object %s { } def keywordsSettings: Seq[Setting[_]] = inConfig(Compile)(Seq( scalaKeywords := getScalaKeywords, - generateKeywords <<= (sourceManaged, scalaKeywords) map writeScalaKeywords, - sourceGenerators <+= generateKeywords map (x => Seq(x)) + generateKeywords := writeScalaKeywords(sourceManaged.value, scalaKeywords.value), + sourceGenerators += (generateKeywords map (x => Seq(x))).taskValue )) } diff --git a/project/build.properties b/project/build.properties index 817bc38df..27e88aa11 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.13