From 9abb62dd5645ac254eee302fe523ce3be5b69c0a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Feb 2025 02:11:53 +0000 Subject: [PATCH 1/4] Update scalafmt-cli_2.13, scalafmt-core to 3.9.0 --- .scalafmt.conf | 2 +- project/deps.sc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 53910824dc..ecc4271950 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.6" +version = "3.9.0" align.preset = more maxColumn = 100 diff --git a/project/deps.sc b/project/deps.sc index d3ca1f3222..7823152bdb 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -211,7 +211,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.8.6" + def scalafmtCli = ivy"org.scalameta:scalafmt-cli_2.13:3.9.0" // 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 3cf24bd897e8e0a292464e840b023a50119cb9ae Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Feb 2025 02:13:06 +0000 Subject: [PATCH 2/4] Reformat with scalafmt 3.9.0 Executed command: scalafmt --non-interactive --- build.sc | 4 ++-- .../main/scala/scala/cli/commands/config/ConfigOptions.scala | 2 +- .../src/main/scala/scala/cli/commands/export0/Export.scala | 2 +- .../main/scala/scala/cli/commands/shared/HelpMessages.scala | 2 +- .../scala/scala/build/preprocessing/directives/ScalaJs.scala | 2 +- .../scala/scala/cli/integration/DependencyUpdateTests.scala | 3 ++- .../cli/integration/FixScalafixRulesTestDefinitions.scala | 2 +- .../test/scala/scala/cli/integration/RunTestDefinitions.scala | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.sc b/build.sc index d5b6db9674..5ef1afe504 100644 --- a/build.sc +++ b/build.sc @@ -533,7 +533,7 @@ trait Core extends ScalaCliCrossSbtModule | def giter8Organization = "${Deps.giter8.dep.module.organization.value}" | def giter8Name = "${Deps.giter8.dep.module.name.value}" | def giter8Version = "${Deps.giter8.dep.version}" - | + | | def sbtVersion = "${Deps.Versions.sbtVersion}" | | def mavenVersion = "${Deps.Versions.mavenVersion}" @@ -1082,7 +1082,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests | def workspaceDirName = "$workspaceDirName" | def libsodiumVersion = "${deps.libsodiumVersion}" | def dockerArchLinuxImage = "${TestDeps.archLinuxImage}" - | + | | def toolkitVersion = "${Deps.toolkitVersion}" | def toolkitVersionForNative04 = "${Deps.toolkitVersionForNative04}" | def toolkitVersionForNative05 = "${Deps.toolkitVersionForNative05}" diff --git a/modules/cli/src/main/scala/scala/cli/commands/config/ConfigOptions.scala b/modules/cli/src/main/scala/scala/cli/commands/config/ConfigOptions.scala index c47008d64d..901a1d0554 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/config/ConfigOptions.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/config/ConfigOptions.scala @@ -127,7 +127,7 @@ object ConfigOptions { | ${Console.BOLD}$progName $cmdName key value${Console.RESET} |For example, to globally set the interactive mode: | ${Console.BOLD}$progName $cmdName interactive true${Console.RESET} - | + | |Available keys: | ${configKeyMessages(includeHidden = true).mkString(s"${System.lineSeparator} ")} | diff --git a/modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala b/modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala index 02d1964c3b..5ad28c8698 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala @@ -162,7 +162,7 @@ object Export extends ScalaCommand[ExportOptions] { val exportOptionsString = exportOptions.mkString(", ") if exportOptions.length > 1 then { logger.error( - s"""Error: Cannot export to more than one tool at once (currently chosen: $exportOptionsString). + s"""Error: Cannot export to more than one tool at once (currently chosen: $exportOptionsString). |Pick one build tool to export to.""".stripMargin ) sys.exit(1) diff --git a/modules/cli/src/main/scala/scala/cli/commands/shared/HelpMessages.scala b/modules/cli/src/main/scala/scala/cli/commands/shared/HelpMessages.scala index d7fdea1cca..d14eeaf398 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/shared/HelpMessages.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/shared/HelpMessages.scala @@ -33,7 +33,7 @@ object HelpMessages { s"Detailed documentation can be found on our website: $docsWebsiteUrl" def commandFullHelpReference(commandName: String, needsPower: Boolean = false): String = { val maybePowerString = if needsPower then "--power " else "" - s"""You are currently viewing the basic help for the $commandName sub-command. You can view the full help by running: + s"""You are currently viewing the basic help for the $commandName sub-command. You can view the full help by running: | ${Console.BOLD}${ScalaCli.progName} $maybePowerString$commandName --help-full${Console .RESET}""".stripMargin } diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala index a4d5dae061..ee10b265e9 100644 --- a/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala +++ b/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala @@ -43,7 +43,7 @@ import scala.util.Try |`//> using jsModuleSplitStyleStr` _value_ | |`//> using jsEsVersionStr` _value_ - | + | |`//> using jsEmitWasm` _true|false_ | |`//> using jsEsModuleImportMap` _value_ diff --git a/modules/integration/src/test/scala/scala/cli/integration/DependencyUpdateTests.scala b/modules/integration/src/test/scala/scala/cli/integration/DependencyUpdateTests.scala index 9ecf1b9ad4..3e7ab62ff7 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/DependencyUpdateTests.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/DependencyUpdateTests.scala @@ -25,7 +25,8 @@ class DependencyUpdateTests extends ScalaCliSuite { ) expect(p.out.trim().contains("Updated dependency")) expect( // check if dependency update command modify file - os.read(root / fileName) != fileContent) + os.read(root / fileName) != fileContent + ) // after updating dependencies app should run val out = os.proc(TestUtil.cli, fileName).call(cwd = root).out.trim() diff --git a/modules/integration/src/test/scala/scala/cli/integration/FixScalafixRulesTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/FixScalafixRulesTestDefinitions.scala index 56774081fb..e4ea5d15d2 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/FixScalafixRulesTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/FixScalafixRulesTestDefinitions.scala @@ -83,7 +83,7 @@ trait FixScalafixRulesTestDefinitions { | |object Hello { | def main(args: Array[String]): Unit = { - | + | | println("Hello") | } |} diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala index b59c5e9174..94d26398bc 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala @@ -1587,7 +1587,7 @@ abstract class RunTestDefinitions | assert(BuildInfo.Main.resolvers.size == 3) | assert(BuildInfo.Main.resourceDirs.size == 1) | assert(BuildInfo.Main.customJarsDecls.size == 2) - | + | | assert(BuildInfo.Test.sources.head.endsWith("Test.scala")) | assert(BuildInfo.Test.scalacOptions == Seq("-Xasync")) | assert(BuildInfo.Test.scalaCompilerPlugins.size == 0) From 9f34c71a215cbcb21a322dd3835f8a5fb8664e36 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Feb 2025 02:13:06 +0000 Subject: [PATCH 3/4] Add 'Reformat with scalafmt 3.9.0' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bff72cdcfe..1f7d70a5aa 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,6 @@ # Scala Steward: Reformat with scalafmt 3.8.5 74f069ccdaa91872cb77dc1f902752221d588db1 + +# Scala Steward: Reformat with scalafmt 3.9.0 +3cf24bd897e8e0a292464e840b023a50119cb9ae From d884c3853d554d5c1607778031010b9713d4cd79 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Tue, 18 Feb 2025 13:17:24 +0100 Subject: [PATCH 4/4] Adjust reference docs --- website/docs/reference/cli-options.md | 2 +- website/docs/reference/commands.md | 2 +- website/docs/reference/directives.md | 2 +- website/docs/reference/scala-command/cli-options.md | 2 +- website/docs/reference/scala-command/commands.md | 2 +- website/docs/reference/scala-command/directives.md | 2 +- website/docs/reference/scala-command/runner-specification.md | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 591283ff1e..93f81e9fe8 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.8.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.0 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/commands.md b/website/docs/reference/commands.md index 5e26d87d5c..c4eabbcb54 100644 --- a/website/docs/reference/commands.md +++ b/website/docs/reference/commands.md @@ -46,7 +46,7 @@ For example, to globally set the interactive mode: ```sh scala-cli config interactive true ``` - + Available keys: - actions Globally enables actionable diagnostics. Enabled by default. - github.token GitHub token. diff --git a/website/docs/reference/directives.md b/website/docs/reference/directives.md index 96905ca214..5cc8a1e4cc 100644 --- a/website/docs/reference/directives.md +++ b/website/docs/reference/directives.md @@ -407,7 +407,7 @@ Add Scala.js options `//> using jsModuleSplitStyleStr` _value_ `//> using jsEsVersionStr` _value_ - + `//> using jsEmitWasm` _true|false_ `//> using jsEsModuleImportMap` _value_ diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md index 24f5273595..76b1f864a7 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.8.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.0 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/commands.md b/website/docs/reference/scala-command/commands.md index e9839dbd0b..c870646740 100644 --- a/website/docs/reference/scala-command/commands.md +++ b/website/docs/reference/scala-command/commands.md @@ -45,7 +45,7 @@ For example, to globally set the interactive mode: ```sh scala-cli config interactive true ``` - + Available keys: - actions Globally enables actionable diagnostics. Enabled by default. - github.token GitHub token. diff --git a/website/docs/reference/scala-command/directives.md b/website/docs/reference/scala-command/directives.md index d3da4c9add..e2ab732b8b 100644 --- a/website/docs/reference/scala-command/directives.md +++ b/website/docs/reference/scala-command/directives.md @@ -282,7 +282,7 @@ Add Scala.js options `//> using jsModuleSplitStyleStr` _value_ `//> using jsEsVersionStr` _value_ - + `//> using jsEmitWasm` _true|false_ `//> using jsEsModuleImportMap` _value_ diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md index 91151ea271..d8aa628082 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -659,7 +659,7 @@ For example, to globally set the interactive mode: ```sh scala-cli config interactive true ``` - + Available keys: - actions Globally enables actionable diagnostics. Enabled by default. - github.token GitHub token. @@ -3924,7 +3924,7 @@ Aliases: `--dialect` **--scalafmt-version** -Pass scalafmt version before running it (3.8.6 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.0 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. Aliases: `--fmt-version`