feat: update to scalafmt 3.4.0 (#352)

* feat: update to scalafmt 3.4.0 * fix: use main branch instead of master for actions
sbt · Jan 29, 2022 · 1b68a3a · 1b68a3a
1 parent 11ce988
commit 1b68a3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,9 +2,9 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   build:

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,11 +1,11 @@
-version = "3.3.2"
+version = "3.4.0"
 
 preset         = "defaultWithAlign"
 runner.dialect = "scala213source3"
 
 maxColumn                        = 100
 indentOperator.preset            = "spray"
-unindentTopLevelOperators        = true
+indentOperator.exemptScope       = "all"
 spaces.inImportCurlyBraces       = true
 rewrite.rules                    = ["Imports", "RedundantBraces", "RedundantParens"]
 rewrite.imports.sort             = "ascii"

diff --git a/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala b/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala
@@ -217,14 +217,14 @@ private object Template {
        |}""".stripMargin
 
   def scalafmtConf: String =
-    """|version = "3.3.2"
+    """|version = "3.4.0"
        |
        |preset         = "defaultWithAlign"
        |runner.dialect = "scala3"
        |
        |maxColumn                        = 100
        |indentOperator.preset            = "spray"
-       |unindentTopLevelOperators        = true
+       |indentOperator.exemptScope       = "all"
        |spaces.inImportCurlyBraces       = true
        |rewrite.rules                    = ["Imports", "RedundantBraces", "RedundantParens"]
        |rewrite.imports.sort             = "ascii"