From a5a09c52b7a03cef47e5f6465b6ceac965bec9aa Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 6 May 2025 23:48:32 +0000 Subject: [PATCH 1/2] Update scalafmt-cli_2.13, scalafmt-core to 3.9.6 --- .scalafmt.conf | 2 +- project/deps.sc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d7918bf246..25a0f2e4bf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.5" +version = "3.9.6" align.preset = more maxColumn = 100 diff --git a/project/deps.sc b/project/deps.sc index d469eeb5ef..d205350c86 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -122,7 +122,7 @@ object Deps { def jsoniterScalaJava8 = "2.13.5.2" def jsoup = "1.20.1" def scalaMeta = "4.13.5" - def scalafmt = "3.9.5" + def scalafmt = "3.9.6" def scalaNative04 = "0.4.17" def scalaNative05 = "0.5.7" def scalaNative = scalaNative05 From 2f971de43b08c819516245fd9b4e4543214dca03 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 7 May 2025 10:18:34 +0200 Subject: [PATCH 2/2] Adjust reference docs --- website/docs/reference/cli-options.md | 2 +- website/docs/reference/scala-command/cli-options.md | 2 +- website/docs/reference/scala-command/runner-specification.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 2c39742eff..fc4f763c83 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -501,7 +501,7 @@ Pass a global dialect for scalafmt. This overrides whatever value is configured Aliases: `--fmt-version` -Pass scalafmt version before running it (3.9.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. ## Global suppress warning options diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md index 0b7eac939b..17dda850b9 100644 --- a/website/docs/reference/scala-command/cli-options.md +++ b/website/docs/reference/scala-command/cli-options.md @@ -370,7 +370,7 @@ Aliases: `--fmt-version` `IMPLEMENTATION specific` per Scala Runner specification -Pass scalafmt version before running it (3.9.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. ## Global suppress warning options diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md index c0e01b0dfd..3914a4a2dd 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -3948,7 +3948,7 @@ Aliases: `--dialect` **--scalafmt-version** -Pass scalafmt version before running it (3.9.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. Aliases: `--fmt-version`