Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-cli_2.13, scalafmt-core to 3.9.0 #3507

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@

# Scala Steward: Reformat with scalafmt 3.8.5
74f069ccdaa91872cb77dc1f902752221d588db1

# Scala Steward: Reformat with scalafmt 3.9.0
3cf24bd897e8e0a292464e840b023a50119cb9ae
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.6"
version = "3.9.0"

align.preset = more
maxColumn = 100
Expand Down
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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} ")}
|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import scala.util.Try
|`//> using jsModuleSplitStyleStr` _value_
|
|`//> using jsEsVersionStr` _value_
|
|
|`//> using jsEmitWasm` _true|false_
|
|`//> using jsEsModuleImportMap` _value_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ trait FixScalafixRulesTestDefinitions {
|
|object Hello {
| def main(args: Array[String]): Unit = {
|
|
| println("Hello")
| }
|}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/directives.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ Add Scala.js options
`//> using jsModuleSplitStyleStr` _value_

`//> using jsEsVersionStr` _value_

`//> using jsEmitWasm` _true|false_

`//> using jsEsModuleImportMap` _value_
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/directives.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ Add Scala.js options
`//> using jsModuleSplitStyleStr` _value_

`//> using jsEsVersionStr` _value_

`//> using jsEmitWasm` _true|false_

`//> using jsEsModuleImportMap` _value_
Expand Down
4 changes: 2 additions & 2 deletions website/docs/reference/scala-command/runner-specification.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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`

Expand Down
Loading