luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to sbt 0.13.13 (#56)

This commit is contained in:
Dale Wijnand 2016-11-09 14:06:48 +00:00 committed by GitHub
parent ea56f331a1
commit d6ebb4bc1e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project/Util.scala
View File

@ -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
))
}

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.13