upgrade sbt & scala

pull/138/head
Thibault Duplessis 2014-12-04 12:09:21 +01:00
parent a9499f29cd
commit 8ccd6babda
4 changed files with 5 additions and 6 deletions

@ -1 +1 @@
Subproject commit be800c14554d0cce621e496dd452751c83966a38
Subproject commit ce322f1c5102d83404db7fab138957a8b9fc19e3

View File

@ -13,15 +13,14 @@ object ApplicationBuild extends Build {
scalaVersion := "2.11.4",
resolvers ++= Dependencies.Resolvers.commons,
scalacOptions := compilerOptions,
incOptions := incOptions.value.withNameHashing(true),
offline := true,
libraryDependencies ++= Seq(
scalaz, scalalib, hasher, config, apache,
jgit, elastic4s, findbugs, RM, PRM,
spray.caching, maxmind, prismic),
scalacOptions := compilerOptions,
// updateOptions := updateOptions.value.withCachedResolution(true),
sources in doc in Compile := List(),
incOptions := incOptions.value.withNameHashing(true),
TwirlKeys.templateImports ++= Seq(
"lila.game.{ Game, Player, Pov }",
"lila.user.{ User, UserContext }",

View File

@ -7,11 +7,11 @@ object BuildSettings {
def buildSettings = Defaults.defaultSettings ++ Seq(
organization := "org.lichess",
scalaVersion := "2.11.1",
scalaVersion := "2.11.4",
resolvers ++= Dependencies.Resolvers.commons,
parallelExecution in Test := false,
scalacOptions := compilerOptions,
incOptions := incOptions.value.withNameHashing(true),
// updateOptions := updateOptions.value.withCachedResolution(true),
sources in doc in Compile := List())
def defaultDeps = Seq(scalaz, scalalib, jodaTime, spray.util, ws)

View File

@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.7