From 95f183f9bdc3a4e70c08bde981689c4c15451016 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 13 Nov 2015 01:58:39 -0500 Subject: [PATCH 1/2] Remove scala-library from Java only subproject. Fixes #20 --- project/Util.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/Util.scala b/project/Util.scala index cfe97dd1c..860d6c84b 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -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] = From f84251c877c80b26faea14892fde4699992bab1a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 13 Nov 2015 01:59:18 -0500 Subject: [PATCH 2/2] 0.1.0-M6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0ba5c9ab4..02b37203c 100644 --- a/build.sbt +++ b/build.sbt @@ -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(