diff options
| author | Diego <diegolparra@gmail.com> | 2016-12-08 17:21:21 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2016-12-08 17:21:21 -0300 |
| commit | 0ac11e3a50453b69af7472f744ac683ff9bea9e2 (patch) | |
| tree | 47ded66e1cf96749b0bdfc5b956df68e53884198 /project | |
| parent | 59965fa53862876aacee4a57661d9e9af2689b34 (diff) | |
| download | Kamon-0ac11e3a50453b69af7472f744ac683ff9bea9e2.tar.gz Kamon-0ac11e3a50453b69af7472f744ac683ff9bea9e2.tar.bz2 Kamon-0ac11e3a50453b69af7472f744ac683ff9bea9e2.zip | |
kamon-core-0.6.x series
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 2 | ||||
| -rw-r--r-- | project/Settings.scala | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bcc926f5..0b0f44e8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { "Kamon Repository Snapshots" at "http://snapshots.kamon.io" ) - val akkaVersion = "2.4.12" + val akkaVersion = "2.3.15" val slf4jVersion = "1.7.7" val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion diff --git a/project/Settings.scala b/project/Settings.scala index 0144d04a..12367b4e 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -23,12 +23,12 @@ import scalariform.formatter.preferences._ object Settings { - val JavaVersion = "1.6" + val JavaVersion = "1.7" val SVersion = "2.11.8" lazy val basicSettings = Seq( scalaVersion := SVersion, - crossScalaVersions := Seq("2.10.5", SVersion, "2.12.0"), + crossScalaVersions := Seq("2.10.5", SVersion), resolvers ++= Dependencies.resolutionRepos, fork in run := true, parallelExecution in Global := false, @@ -50,11 +50,6 @@ object Settings { "-language:postfixOps", "-language:implicitConversions", "-Xlog-reflective-calls" -// "-Yno-adapted-args", -// "-Ywarn-dead-code", -// "-Ywarn-unused-import" - // "-Ywarn-numeric-widen", -// "-Ywarn-value-discard", ) lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq( |