Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.10.1"
version = "3.10.2"

align.preset = more
maxColumn = 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class ConfigTests extends ScalaCliSuite {
TestInputs().fromRoot { root =>
val confDir = root / "config"
val confFile = confDir / "test-config.json"
val content =
val content =
// non-formatted on purpose
s"""{
| "httpProxy": { "address" : "$proxyAddr" } }
Expand Down
10 changes: 5 additions & 5 deletions project/deps/package.mill.scala
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ object Deps {
def coursierCli = coursierDefault
def coursierPublish = "0.4.3"
def jmh = "1.37"
def jsoniterScala = "2.38.4"
def jsoniterScala = "2.38.5"
def jsoup = "1.21.2"
def scalaMeta = "4.14.1"
def scalafmt = "3.10.1"
def scalafmt = "3.10.2"
def scalaNative04 = "0.4.17"
def scalaNative05 = "0.5.9"
def scalaNative = scalaNative05
Expand All @@ -146,7 +146,7 @@ object Deps {
def signingCli = "0.2.11"
def signingCliJvmVersion = Java.defaultJava
def javaSemanticdb = "0.10.0"
def javaClassName = "0.1.8"
def javaClassName = "0.1.9"
def bloop = "2.0.17"
def sbtVersion = "1.11.7"
def mavenVersion = "3.8.1"
Expand Down Expand Up @@ -191,7 +191,7 @@ object Deps {
def dockerClient = mvn"com.spotify:docker-client:8.16.0"
def expecty = mvn"com.eed3si9n.expecty::expecty:0.17.1"
def fansi = mvn"com.lihaoyi::fansi:0.5.1"
def giter8 = mvn"org.foundweekends.giter8:giter8:0.16.2"
def giter8 = mvn"org.foundweekends.giter8:giter8:0.18.0"
def guava = mvn"com.google.guava:guava:33.5.0-jre"
def javaClassName =
mvn"org.virtuslab.scala-cli.java-class-name:java-class-name_3:${Versions.javaClassName}"
Expand All @@ -214,7 +214,7 @@ object Deps {
def metaconfigTypesafe =
mvn"org.scalameta::metaconfig-typesafe-config:0.16.0"
.exclude(("org.scala-lang", "scala-compiler"))
def munit = mvn"org.scalameta::munit:1.2.0"
def munit = mvn"org.scalameta::munit:1.2.1"
def nativeTestRunner = mvn"org.scala-native::test-runner:${Versions.scalaNative}"
def nativeTools = mvn"org.scala-native::tools:${Versions.scalaNative}"
def osLib = mvn"com.lihaoyi::os-lib:0.11.6"
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.10.1 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
Pass scalafmt version before running it (3.10.2 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/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.10.1 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
Pass scalafmt version before running it (3.10.2 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.

## Global suppress warning options

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3996,7 +3996,7 @@ Aliases: `--dialect`

**--scalafmt-version**

Pass scalafmt version before running it (3.10.1 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
Pass scalafmt version before running it (3.10.2 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.

Aliases: `--fmt-version`

Expand Down