fix autoformatting

This commit is contained in:
Thibault Duplessis 2017-08-23 19:26:45 -05:00
parent 664804bc47
commit 4a15795915
2 changed files with 4 additions and 5 deletions

View file

@ -1,6 +1,5 @@
import com.typesafe.sbt.packager.Keys.scriptClasspath
import com.typesafe.sbt.web.SbtWeb.autoImport._
import com.typesafe.sbt.SbtScalariform
import play.Play.autoImport._
import play.sbt.PlayImport._
import play.twirl.sbt.Import._
@ -50,9 +49,7 @@ object ApplicationBuild extends Build {
"lila.common.paginator.Paginator"
),
// trump sbt-web into not looking at public/
resourceDirectory in Assets := (sourceDirectory in Compile).value / "assets",
// don't autoformat play generated routes classes
excludeFilter in SbtScalariform.autoImport.scalariformFormat in Compile := "*Routes*"
resourceDirectory in Assets := (sourceDirectory in Compile).value / "assets"
))
lazy val modules = Seq(

View file

@ -1,4 +1,5 @@
import com.typesafe.sbt.SbtScalariform.ScalariformKeys
import com.typesafe.sbt.SbtScalariform.autoImport.scalariformFormat
import play.sbt.Play.autoImport._
import sbt._, Keys._
import scalariform.formatter.preferences._
@ -24,7 +25,8 @@ object BuildSettings {
) ++ Seq(
ScalariformKeys.preferences := ScalariformKeys.preferences.value
.setPreference(DanglingCloseParenthesis, Force)
.setPreference(DoubleIndentConstructorArguments, true)
.setPreference(DoubleIndentConstructorArguments, true),
excludeFilter in scalariformFormat := "*Routes*"
)
def defaultDeps = Seq(scalaz, scalalib, jodaTime, ws, java8compat, specs2)