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

Merge pull request #21 from sbt/fix/20 

Fixes sbt/util#20
This commit is contained in:
eugene yokota 2015-11-13 03:53:33 -05:00
parent dbd90eb605 f84251c877
commit 30c4bc1043
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -1,7 +1,7 @@
import Dependencies._
import Util._
def baseVersion: String = "0.1.0-M5"
def baseVersion: String = "0.1.0-M6"
def internalPath = file("internal")
def commonSettings: Seq[Setting[_]] = Seq(

3
project/Util.scala
View File

@ -10,7 +10,8 @@ object Util {
crossPaths := false,
compileOrder := CompileOrder.JavaThenScala,
unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join,
crossScalaVersions := Seq(Dependencies.scala211)
crossScalaVersions := Seq(Dependencies.scala211),
autoScalaLibrary := false
)
def getScalaKeywords: Set[String] =