diff --git a/.scalafmt.conf b/.scalafmt.conf index ab867de3de..c86c9c30d7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.9" +version = "3.9.10" align.preset = more maxColumn = 100 diff --git a/modules/integration/src/test/scala/scala/cli/integration/InstallAndUninstallCompletionsTests.scala b/modules/integration/src/test/scala/scala/cli/integration/InstallAndUninstallCompletionsTests.scala index 3569e5b492..dcfad0c342 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/InstallAndUninstallCompletionsTests.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/InstallAndUninstallCompletionsTests.scala @@ -10,8 +10,8 @@ class InstallAndUninstallCompletionsTests extends ScalaCliSuite { val bashRcFile: String = ".bashrc" val fishRcFile: String = "config.fish" val rcContent: String = s""" - |dummy line - |dummy line""".stripMargin + |dummy line + |dummy line""".stripMargin val testInputs: TestInputs = TestInputs( os.rel / zshRcFile -> rcContent, os.rel / bashRcFile -> rcContent, diff --git a/modules/integration/src/test/scala/scala/cli/integration/MillTestHelper.scala b/modules/integration/src/test/scala/scala/cli/integration/MillTestHelper.scala index 882ec8a495..2c82c7717d 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/MillTestHelper.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/MillTestHelper.scala @@ -10,8 +10,8 @@ trait MillTestHelper { protected val millJvmOptsFileName: String = ".mill-jvm-opts" protected val millJvmOptsContent: String = """-Xmx512m - |-Xms128m - |""".stripMargin + |-Xms128m + |""".stripMargin protected val millDefaultProjectName = "project" diff --git a/project/deps/package.mill.scala b/project/deps/package.mill.scala index efc6f9a07e..ec0919f3c2 100644 --- a/project/deps/package.mill.scala +++ b/project/deps/package.mill.scala @@ -120,7 +120,7 @@ object Deps { def jsoniterScalaJava8 = "2.13.5.2" def jsoup = "1.21.2" def scalaMeta = "4.13.9" - def scalafmt = "3.9.9" + def scalafmt = "3.9.10" def scalaNative04 = "0.4.17" def scalaNative05 = "0.5.8" def scalaNative = scalaNative05 diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 7c7ae13207..7071ecd4c0 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.9 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.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 bb2c980d4c..51df3649d0 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.9 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.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 2baed15d71..5a4ed7cece 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.9 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. +Pass scalafmt version before running it (3.9.10 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file. Aliases: `--fmt-version`