From 1b68a3a875d4529859ff0448ca48b275d6e12048 Mon Sep 17 00:00:00 2001 From: Heiko Seeberger Date: Sat, 29 Jan 2022 14:15:41 +0100 Subject: [PATCH] feat: update to scalafmt 3.4.0 (#352) * feat: update to scalafmt 3.4.0 * fix: use main branch instead of master for actions --- .github/workflows/test.yml | 4 ++-- .scalafmt.conf | 4 ++-- src/main/scala/de/heikoseeberger/sbtfresh/Template.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbb48ee..202a3b0 100644 --- 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 index 6f3931f..3d03256 100644 --- 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 index d8c4911..6d5f1e0 100644 --- 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"