luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow disablePlugins(SbtScalariform) to work 

SbtScalariform is now an AutoPlugin, so its scalariformSettings are
already added to the project. So don't add it again otherwise
`disablePlugins(SbtScalariform)` won't work.

And miscellaneous cleanups.
This commit is contained in:
Dale Wijnand 2017-03-20 10:58:18 +00:00
parent 6e6f66d6d0
commit ede2b865b4
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
project/Formatting.scala
View File

@ -1,15 +1,13 @@
import sbt._ import sbt._, Keys._
import sbt.Keys._ import com.typesafe.sbt.SbtScalariform._, autoImport._
import com.typesafe.sbt.SbtScalariform._
import ScalariformKeys.{ format => scalariformFormat, preferences => scalariformPreferences }
object Formatting { object Formatting {
lazy val BuildConfig = config("build") extend Compile val BuildConfig = config("build") extend Compile
lazy val BuildSbtConfig = config("buildsbt") extend Compile val BuildSbtConfig = config("buildsbt") extend Compile
val scalariformCheck = taskKey[Unit]("Checks that the existing code is formatted, via git diff") val scalariformCheck = taskKey[Unit]("Checks that the existing code is formatted, via git diff")
lazy val prefs: Seq[Setting[_]] = { private val prefs: Seq[Setting[_]] = {
import scalariform.formatter.preferences._ import scalariform.formatter.preferences._
Seq( Seq(
scalariformPreferences ~= (_ scalariformPreferences ~= (_
@ -20,8 +18,8 @@ object Formatting {
) )
} }
lazy val settings: Seq[Setting[_]] = Seq() ++ scalariformSettings ++ prefs val settings: Seq[Setting[_]] = Seq() ++ prefs
lazy val sbtFilesSettings: Seq[Setting[_]] = Seq() ++ scalariformSettings ++ prefs ++ val sbtFilesSettings: Seq[Setting[_]] = Seq() ++ prefs ++
inConfig(BuildConfig)(configScalariformSettings) ++ inConfig(BuildConfig)(configScalariformSettings) ++
inConfig(BuildSbtConfig)(configScalariformSettings) ++ inConfig(BuildSbtConfig)(configScalariformSettings) ++
Seq( Seq(