From 2097447212ddc88772634b3a3ac2f3ed8891a380 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 Jul 2023 02:52:21 +0000 Subject: [PATCH 1/2] Update scalafmt-cli_2.13, scalafmt-core to 3.7.10 --- .scalafmt.conf | 2 +- project/deps.sc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index fd9c501627..2a2984f9f2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.7" +version = "3.7.10" align.preset = more maxColumn = 100 diff --git a/project/deps.sc b/project/deps.sc index ebc42391f1..78bf2fa525 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -146,7 +146,7 @@ object Deps { def scala3Compiler(sv: String) = ivy"org.scala-lang:scala3-compiler_3:$sv" def scalaAsync = ivy"org.scala-lang.modules::scala-async:1.0.1".exclude("*" -> "*") def scalac(sv: String) = ivy"org.scala-lang:scala-compiler:$sv" - def scalafmtCli = ivy"org.scalameta:scalafmt-cli_2.13:3.7.7" + def scalafmtCli = ivy"org.scalameta:scalafmt-cli_2.13:3.7.10" // Force using of 2.13 - is there a better way? def scalaJsEnvJsdomNodejs = ivy"org.scala-js:scalajs-env-jsdom-nodejs_2.13:1.1.0" From 29e2912fecbc9762bdfcb69c9e4e6163f8ec5259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Mon, 17 Jul 2023 12:01:55 +0200 Subject: [PATCH 2/2] Update reference doc --- website/docs/reference/cli-options.md | 2 +- .../reference/scala-command/cli-options.md | 2 +- .../scala-command/runner-specification.md | 46 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index f5bed7c721..e8e5b8aac1 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -406,7 +406,7 @@ Pass a global dialect for scalafmt. This overrides whatever value is configured Aliases: `--fmt-version` -Pass scalafmt version before running it (3.7.7 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.7.10 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 9ac006de29..fa204a1125 100644 --- a/website/docs/reference/scala-command/cli-options.md +++ b/website/docs/reference/scala-command/cli-options.md @@ -354,7 +354,7 @@ Aliases: `--fmt-version` `IMPLEMENTATION specific` per Scala Runner specification -Pass scalafmt version before running it (3.7.7 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.7.10 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 9983b44c21..4369264591 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -274,7 +274,7 @@ Aliases: `--revolver` Print the resulting class path -Aliases: `--print-classpath` ,`-p` +Aliases: `-p` ,`--print-classpath` **--test** @@ -322,7 +322,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -687,7 +687,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -1022,7 +1022,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -1561,7 +1561,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -2082,7 +2082,7 @@ Aliases: `--revolver` List main classes available in the current context -Aliases: `--list-main-classes` ,`--list-main-class` ,`--main-class-list` +Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes` **--command** @@ -2130,7 +2130,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -2660,7 +2660,7 @@ Aliases: `--revolver` List main classes available in the current context -Aliases: `--list-main-classes` ,`--list-main-class` ,`--main-class-list` +Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes` **--command** @@ -2708,7 +2708,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -3244,7 +3244,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -3544,7 +3544,7 @@ Aliases: `--scalafmt-config` Pass configuration as a string. -Aliases: `--scalafmt-conf-snippet` ,`--scalafmt-config-str` +Aliases: `--scalafmt-config-str` ,`--scalafmt-conf-snippet` **--scalafmt-dialect** @@ -3554,7 +3554,7 @@ Aliases: `--dialect` **--scalafmt-version** -Pass scalafmt version before running it (3.7.7 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.7.10 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. Aliases: `--fmt-version` @@ -3855,7 +3855,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -4160,7 +4160,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -4467,7 +4467,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -4766,7 +4766,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -4845,7 +4845,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -4912,7 +4912,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -5003,7 +5003,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -5316,7 +5316,7 @@ Aliases: `--suppress-experimental-warning` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -5625,7 +5625,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -5806,7 +5806,7 @@ Custom completions name Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive** @@ -5873,7 +5873,7 @@ Aliases: `--full-help` ,`-help-full` ,`-full-help` Increase verbosity (can be specified multiple times) -Aliases: `-verbose` ,`-v` +Aliases: `-v` ,`-verbose` **--interactive**