aboutsummaryrefslogtreecommitdiff
path: root/project/Settings.scala
diff options
context:
space:
mode:
authorAndrei Pozolotin <Andrei.Pozolotin@gmail.com>2014-11-13 13:01:38 -0600
committerAndrei Pozolotin <Andrei.Pozolotin@gmail.com>2014-11-14 19:16:57 -0600
commit1198f63a6f5e8988627d299f9acf3c150c72506c (patch)
treefe95f0222a53ebff9756a8f10a39e3b6d2622a3b /project/Settings.scala
parent0915df2573dfa3f4d50bcca4481f409ae3691cc0 (diff)
downloadKamon-1198f63a6f5e8988627d299f9acf3c150c72506c.tar.gz
Kamon-1198f63a6f5e8988627d299f9acf3c150c72506c.tar.bz2
Kamon-1198f63a6f5e8988627d299f9acf3c150c72506c.zip
+ kamon-sigar: new kamon module for #110
Diffstat (limited to 'project/Settings.scala')
-rw-r--r--project/Settings.scala11
1 files changed, 8 insertions, 3 deletions
diff --git a/project/Settings.scala b/project/Settings.scala
index 9f9fc594..484640b7 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -9,15 +9,20 @@ import net.virtualvoid.sbt.graph.Plugin.graphSettings
object Settings {
- val ScalaVersion = "2.10.4"
+ val JavaVersion = "1.6"
+ val ScalaVersion = "2.10.4"
+
lazy val basicSettings = Seq(
scalaVersion := ScalaVersion,
resolvers ++= Dependencies.resolutionRepos,
fork in run := true,
- javacOptions := Seq(
+ javacOptions in compile := Seq(
"-Xlint:-options",
- "-source", "1.6", "-target", "1.6"
+ "-source", JavaVersion, "-target", JavaVersion
+ ),
+ javacOptions in doc := Seq(
+ "-source", JavaVersion
),
scalacOptions := Seq(
"-encoding",