diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 01:12:58 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 01:12:58 +0100 |
| commit | ca7c0563a729727685d7b4cca9236cda82c9f00a (patch) | |
| tree | 3d85b95915cfeb62e0f15145dc05349c9c65d3fd /project | |
| parent | 66b35556aa1bf0975cefa35603660991cdfcc526 (diff) | |
| download | Kamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.tar.gz Kamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.tar.bz2 Kamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.zip | |
! build: switch to scala 2.11
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 2 | ||||
| -rw-r--r-- | project/Settings.scala | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 71054506..b9bd89e7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -23,7 +23,7 @@ object Dependencies { ) val sprayVersion = "1.3.2" - val akkaVersion = "2.3.6" + val akkaVersion = "2.3.9" val aspectjVersion = "1.8.4" val slf4jVersion = "1.7.7" val playVersion = "2.3.5" diff --git a/project/Settings.scala b/project/Settings.scala index 700312c1..c454d63a 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -13,11 +13,10 @@ * ========================================================================================= */ -import com.typesafe.sbt.SbtAspectj.AspectjKeys._ import sbt.Tests.{SubProcess, Group} import sbt._ import Keys._ -import com.typesafe.sbt.{SbtAspectj, SbtScalariform} +import com.typesafe.sbt.SbtScalariform import com.typesafe.sbt.SbtScalariform.ScalariformKeys import Publish.{settings => publishSettings} import Release.{settings => releaseSettings} @@ -27,8 +26,7 @@ import net.virtualvoid.sbt.graph.Plugin.graphSettings object Settings { val JavaVersion = "1.6" - - val ScalaVersion = "2.10.4" + val ScalaVersion = "2.11.5" lazy val basicSettings = Seq( scalaVersion := ScalaVersion, |