diff options
| author | Diego <diegolparra@gmail.com> | 2016-12-13 13:06:29 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2016-12-13 13:06:29 -0300 |
| commit | a74379942b2c672c9ba507093f27ead5693c1240 (patch) | |
| tree | 1a22f1ae9080e4ec7496f0b5536107b35a5acd68 /project | |
| parent | ee7e2218f869eeea8be00441c82b5e6e8f4d99eb (diff) | |
| download | Kamon-a74379942b2c672c9ba507093f27ead5693c1240.tar.gz Kamon-a74379942b2c672c9ba507093f27ead5693c1240.tar.bz2 Kamon-a74379942b2c672c9ba507093f27ead5693c1240.zip | |
wip
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 8 | ||||
| -rw-r--r-- | project/Settings.scala | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0b0f44e8..e92ed5d7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,6 +14,7 @@ */ import sbt._ +import Keys._ object Dependencies { @@ -39,6 +40,13 @@ object Dependencies { val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" + def akkaDependency(moduleName: String) = Def.setting { + scalaBinaryVersion.value match { + case "2.10" | "2.11" => "com.typesafe.akka" %% s"akka-$moduleName" % "2.3.15" + case "2.12" => "com.typesafe.akka" %% s"akka-$moduleName" % "2.4.14" + } + } + def compileScope (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def testScope (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "test") def providedScope (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") diff --git a/project/Settings.scala b/project/Settings.scala index 12367b4e..2b6b093d 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -23,12 +23,12 @@ import scalariform.formatter.preferences._ object Settings { - val JavaVersion = "1.7" - val SVersion = "2.11.8" + val SVersion = "2.12.1" lazy val basicSettings = Seq( + ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }, scalaVersion := SVersion, - crossScalaVersions := Seq("2.10.5", SVersion), + crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1"), resolvers ++= Dependencies.resolutionRepos, fork in run := true, parallelExecution in Global := false, @@ -36,9 +36,7 @@ object Settings { javacOptions := commonJavaOptions ) ++ publishSettings ++ releaseSettings - lazy val commonJavaOptions = Seq( - "-Xlint:-options", - "-source", JavaVersion, "-target", JavaVersion) + lazy val commonJavaOptions = Seq("-Xlint:-options") lazy val commonScalacOptions = Seq( "-encoding", @@ -49,7 +47,8 @@ object Settings { "-deprecation", "-language:postfixOps", "-language:implicitConversions", - "-Xlog-reflective-calls" + "-Xlog-reflective-calls", + "-Ywarn-dead-code" ) lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq( |