Fixing scalafmt config format + removing test-all key

2 files changed, 13 insertions, 16 deletions

diff --git a/README.md b/README.md
index b11e66e..4f138a5 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Do `sbt reload` after adding a plugin and configure a project:
     lazy val root = (project in file("."))
       .settings (name := "Name-Of-Your-Project")
 
-      .integrationTestingConfiguration // Enable integration tests, test-all command
+      .integrationTestingConfiguration // Enable integration tests
 
       .buildInfoConfiguration          // Build info accessible in app code
 
diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index ebe7419..d4215e2 100644
--- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -36,24 +36,27 @@ 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
+            |maxColumn = 120
             |
-            |# reformatDocstrings = true
-            |# scalaDocs = true
+            |docstrings = scalaDocs
+            |reformatComments = true
             |
-            |continuationIndent.callSite = 4
-            |continuationIndent.defnSite = 4
+            |continuationIndent.callSite = 2
+            |continuationIndent.defnSite = 8
             |
             |rewriteTokens: {
             |  "⇒" = "=>"
             |  "←" = "<-"
             |}
             |danglingParentheses = false
+            |align.tokens = true
+            |align.arrowEnumeratorGenerator = true
+            |align.openParenCallSite = true
+            |alwaysBeforeCurlyBraceLambdaParams = false
             |spaces.afterTripleEquals = true
-            |# alignByArrowEnumeratorGenerator = true
+            |newlines.sometimesBeforeColonInMethodReturnType = false
             |binPack.parentConstructors = true
-            |newlines.sometimesBeforeColonInMethodReturnType = true
             |spaces.inImportCurlyBraces = false
             |
             |# align.openParenCallSite = <value>
@@ -202,8 +205,6 @@ object SbtSettings extends AutoPlugin {
 
     lazy val lintingSettings = scalastyleSettings ++ wartRemoverSettings
 
-    lazy val testAll = TaskKey[Unit]("test-all", "Launches all unit and integration tests")
-
     lazy val repositoriesSettings = {
       Seq(
         resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases",
@@ -315,11 +316,7 @@ object SbtSettings extends AutoPlugin {
       }
 
       def integrationTestingConfiguration: Project = {
-        project
-          .configs(IntegrationTest)
-          .settings(Defaults.itSettings ++ Seq(
-            testAll <<= (test in IntegrationTest).dependsOn(test in Test)
-          ))
+        project.configs(IntegrationTest).settings(Defaults.itSettings)
       }
 
       def packagingConfiguration: Project = {