aboutsummaryrefslogtreecommitdiff
path: root/project/Settings.scala
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-02-15 01:12:58 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-02-15 01:12:58 +0100
commitca7c0563a729727685d7b4cca9236cda82c9f00a (patch)
tree3d85b95915cfeb62e0f15145dc05349c9c65d3fd /project/Settings.scala
parent66b35556aa1bf0975cefa35603660991cdfcc526 (diff)
downloadKamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.tar.gz
Kamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.tar.bz2
Kamon-ca7c0563a729727685d7b4cca9236cda82c9f00a.zip
! build: switch to scala 2.11
Diffstat (limited to 'project/Settings.scala')
-rw-r--r--project/Settings.scala6
1 files changed, 2 insertions, 4 deletions
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,