Skip to content

Commit 6a76efd

Browse files
authored
Merge branch 'main' into update/io-4.14.5
2 parents 60fe50a + 43c3f0b commit 6a76efd

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ b128c8a617dfc391b17e0c6422bc07bf4ad9356b
99

1010
# Scala Steward: Reformat with scalafmt 3.9.3
1111
d072833e74416d2392f2969eb81694e58f98ec69
12+
13+
# Scala Steward: Reformat with scalafmt 3.10.4
14+
445c4c065738d78821ba2ae786f8513d51ed113e

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.10.3
1+
version=3.10.4
22

33
align {
44
preset = none

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
157157
},
158158
).dependsOn(pprint).jsSettings(
159159
sharedJSSettings,
160-
libraryDependencies += smorg %%% "io" % "4.14.5" cross
161-
CrossVersion.for3Use2_13,
160+
libraryDependencies +=
161+
smorg %%% "io" % "4.14.5" cross CrossVersion.for3Use2_13,
162162
)
163163

164164
lazy val cli = crossProject(JVMPlatform, NativePlatform)

metaconfig-cli/shared/src/main/scala/metaconfig/cli/Messages.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ object Messages {
3232
else {
3333
var doc = Doc.empty
3434
setting.annotations.foreach {
35-
case section: Section => doc += Doc.line + Doc.text(section.name) +
36-
Doc.char(':') + Doc.line
35+
case section: Section => doc +=
36+
Doc.line + Doc.text(section.name) + Doc.char(':') + Doc.line
3737
case _ =>
3838
}
3939
val name = Case.camelToKebab(setting.name)
4040
doc += Doc.text("--") + Doc.text(name)
4141
setting.extraNames.foreach { name =>
42-
if (name.length == 1) doc += Doc.text(" | -") +
43-
Doc.text(Case.camelToKebab(name))
42+
if (name.length == 1) doc +=
43+
Doc.text(" | -") + Doc.text(Case.camelToKebab(name))
4444
}
4545
if (!setting.isBoolean) doc = doc + {
4646
Doc.space + Doc.text(setting.tpe) + Doc.text(" (default: ") +

0 commit comments

Comments
 (0)