diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2016-10-10 17:34:50 -0400 |
---|---|---|
committer | Stewart Stewart <stewinsalot@gmail.com> | 2016-10-10 17:34:50 -0400 |
commit | 186758c074655c6593323fc4e8de786d16b8568f (patch) | |
tree | dc82d87516a9ef15610e79be1304704afce735ea /src | |
parent | 20684d242b098aca03068df4857f6e1929397f73 (diff) | |
download | sbt-settings-186758c074655c6593323fc4e8de786d16b8568f.tar.gz sbt-settings-186758c074655c6593323fc4e8de786d16b8568f.tar.bz2 sbt-settings-186758c074655c6593323fc4e8de786d16b8568f.zip |
update scalafmt
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index 746fb68..967fd7a 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -36,32 +36,35 @@ object SbtSettings extends AutoPlugin { """# scalafmt sbt plugin config |# refer to https://olafurpg.github.io/scalafmt/#Configuration for properties | - |--style defaultWithAlign # For pretty alignment. - |--maxColumn 120 # For my wide 30" display. + |style = defaultWithAlign # For pretty alignment. + |maxColumn = 120 # For my wide 30" display. | - |--reformatDocstrings true + |reformatDocstrings = true |--scalaDocs | - |--continuationIndentCallSite 4 - |--continuationIndentDefnSite 4 + |continuationIndent.callSite = 4 + |continuationIndent.defnSite = 4 | - |--rewriteTokens ⇒;=>,←;<- - |--danglingParentheses false - |--spaceAfterTripleEquals true - |--alignByArrowEnumeratorGenerator true - |--binPackParentConstructors true - |--allowNewlineBeforeColonInMassiveReturnTypes true - |--spacesInImportCurlyBraces false + |rewriteTokens: { + | "⇒" = "=>" + | "←" = "<-" + |} + |danglingParentheses = false + |spaces.afterTripleEquals = true + |alignByArrowEnumeratorGenerator = true + |binPack.parentConstructors = true + |newlines.sometimesBeforeColonInMethodReturnType = true + |spaces.inImportCurlyBraces = false | - |# --alignByOpenParenCallSite <value> - |# --alignByOpenParenDefnSite <value> + |# align.openParenCallSite = <value> + |# align.openParenDefnSite = <value> | """.stripMargin - val formatFile = file(".scalafmt") + val formatFile = file(".scalafmt.conf") IO.write(formatFile, contents) Seq(formatFile) }.taskValue, - scalafmtConfig in ThisBuild := Some(file(".scalafmt")), + scalafmtConfig in ThisBuild := Some(file(".scalafmt.conf")), testExecution in (Test, test) <<= (testExecution in (Test, test)) dependsOn (scalafmtTest in Compile, scalafmtTest in Test)) |