From 8ebab28a596e74683b0db7e02556da6a58ba2cdb Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 27 Apr 2017 09:57:23 -0700 Subject: Renaming source .scalafmt.conf to scalafmt.conf --- src/main/resources/.scalafmt.conf | 29 ------------------------- src/main/resources/scalafmt.conf | 29 +++++++++++++++++++++++++ src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/main/resources/.scalafmt.conf create mode 100644 src/main/resources/scalafmt.conf (limited to 'src') diff --git a/src/main/resources/.scalafmt.conf b/src/main/resources/.scalafmt.conf deleted file mode 100644 index 8a5d14f..0000000 --- a/src/main/resources/.scalafmt.conf +++ /dev/null @@ -1,29 +0,0 @@ -# scalafmt sbt plugin config -# refer to https://olafurpg.github.io/scalafmt/#Configuration for properties - -project.git = true - -style = defaultWithAlign -maxColumn = 120 - -docstrings = ScalaDoc - -continuationIndent.callSite = 2 -continuationIndent.defnSite = 8 - -rewriteTokens: { - "⇒" = "=>" - "←" = "<-" -} -danglingParentheses = false -align.arrowEnumeratorGenerator = true -align.openParenCallSite = true -spaces.afterTripleEquals = true -spaces.inImportCurlyBraces = false -newlines.alwaysBeforeCurlyBraceLambdaParams = false -newlines.sometimesBeforeColonInMethodReturnType = false -binPack.parentConstructors = true -assumeStandardLibraryStripMargin = true - -# align.openParenCallSite = -# align.openParenDefnSite = diff --git a/src/main/resources/scalafmt.conf b/src/main/resources/scalafmt.conf new file mode 100644 index 0000000..8a5d14f --- /dev/null +++ b/src/main/resources/scalafmt.conf @@ -0,0 +1,29 @@ +# scalafmt sbt plugin config +# refer to https://olafurpg.github.io/scalafmt/#Configuration for properties + +project.git = true + +style = defaultWithAlign +maxColumn = 120 + +docstrings = ScalaDoc + +continuationIndent.callSite = 2 +continuationIndent.defnSite = 8 + +rewriteTokens: { + "⇒" = "=>" + "←" = "<-" +} +danglingParentheses = false +align.arrowEnumeratorGenerator = true +align.openParenCallSite = true +spaces.afterTripleEquals = true +spaces.inImportCurlyBraces = false +newlines.alwaysBeforeCurlyBraceLambdaParams = false +newlines.sometimesBeforeColonInMethodReturnType = false +binPack.parentConstructors = true +assumeStandardLibraryStripMargin = true + +# align.openParenCallSite = +# align.openParenDefnSite = diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index fe4252e..b6eeaa7 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -42,7 +42,7 @@ object SbtSettings extends AutoPlugin { Seq(scalafmtFile) }.taskValue, resourceGenerators in Test += Def.task { - val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream(".scalafmt.conf") + val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf") val formatConfFile = file(".scalafmt.conf") IO.write(formatConfFile, IO.readBytes(scalafmtConfStream)) Seq(formatConfFile) -- cgit v1.2.3