From 1fbb07ab9d1186ad9bf1f9b680c8f6fd61aaf5fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 13:25:02 -0600 Subject: [PATCH] Bump scalameta/scalafmt from v2.7.5 to v3.1.0 (#2131) * Bump scalameta/scalafmt from v2.7.5 to v3.1.0 Bumps scalameta/scalafmt from v2.7.5 to v3.1.0. --- updated-dependencies: - dependency-name: scalameta/scalafmt dependency-type: direct:production ... Signed-off-by: dependabot[bot] * fix version Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Admiral Awkbar --- Dockerfile | 2 +- Dockerfile-slim | 2 +- TEMPLATES/.scalafmt.conf | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59ba7a13..d819dc59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ FROM zricethezav/gitleaks:v7.6.1 as gitleaks FROM garethr/kubeval:0.15.0 as kubeval FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format -FROM scalameta/scalafmt:v2.7.5 as scalafmt +FROM scalameta/scalafmt:v3.1.0 as scalafmt ################## # Get base image # diff --git a/Dockerfile-slim b/Dockerfile-slim index 24c5e1c6..2502e59f 100644 --- a/Dockerfile-slim +++ b/Dockerfile-slim @@ -29,7 +29,7 @@ FROM zricethezav/gitleaks:v7.6.1 as gitleaks FROM garethr/kubeval:0.15.0 as kubeval FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format -FROM scalameta/scalafmt:v2.7.5 as scalafmt +FROM scalameta/scalafmt:v3.1.0 as scalafmt ################## # Get base image # diff --git a/TEMPLATES/.scalafmt.conf b/TEMPLATES/.scalafmt.conf index 7ee974db..d3d7ff99 100644 --- a/TEMPLATES/.scalafmt.conf +++ b/TEMPLATES/.scalafmt.conf @@ -1,4 +1,7 @@ // Scala Format Configuration // https://scalameta.org/scalafmt/docs/configuration.html +version = 3.1.0 align.preset = more // For pretty alignment. maxColumn = 80 +// https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects +runner.dialect = scala3