Skip to content

Commit 72c1a63

Browse files
Update scalafmt-core to 3.10.3 (#5860)
1 parent c4d29cd commit 72c1a63

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ d5e9a90c86690605d6572c03f4380b5bd65056d1
3030

3131
# Scala Steward: Reformat with scalafmt 3.9.7
3232
cdb933851eea9dd94f1e44cf371adb0617b664be
33+
34+
# Scala Steward: Reformat with scalafmt 3.10.3
35+
0d900204805631c320a176378ecf171ab8989ddb

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.10.1"
1+
version = "3.10.3"
22
runner.dialect = scala213
33

44
fileOverride {

scalafix/build.sbt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,23 @@ def scio(version: String): List[ModuleID] = {
6868
def scalafix(target: String, inputScio: String, outputScio: String): (String, ScalafixProject) = {
6969
val under = target.replace(".", "_")
7070
def p(prefix: String, dep: String) = sbt.Project
71-
.apply(s"$prefix-$under", file(s"$prefix-$under")).settings(libraryDependencies ++= scio(dep))
72-
target -> ScalafixProject(p("input", inputScio), p("output", outputScio), ConfigAxis(s"-scio-$under", s"-$under-"))
71+
.apply(s"$prefix-$under", file(s"$prefix-$under"))
72+
.settings(libraryDependencies ++= scio(dep))
73+
target -> ScalafixProject(
74+
p("input", inputScio),
75+
p("output", outputScio),
76+
ConfigAxis(s"-scio-$under", s"-$under-")
77+
)
7378
}
7479

7580
lazy val scalafixProjects = Map(
76-
scalafix("0.7", Scio.`0.6`, Scio.`0.7`), // Scio 0.7
77-
scalafix("0.8", Scio.`0.7`, Scio.`0.8`), // Scio 0.8
78-
scalafix("0.10", Scio.`0.9`, Scio.`0.11`), // Scio 0.10
81+
scalafix("0.7", Scio.`0.6`, Scio.`0.7`), // Scio 0.7
82+
scalafix("0.8", Scio.`0.7`, Scio.`0.8`), // Scio 0.8
83+
scalafix("0.10", Scio.`0.9`, Scio.`0.11`), // Scio 0.10
7984
scalafix("0.12", Scio.`0.11`, Scio.`0.12`), // Scio 0.12
8085
scalafix("0.13", Scio.`0.12`, Scio.`0.13`), // Scio 0.13
8186
scalafix("0.14", Scio.`0.13`, Scio.`0.14`), // Scio 0.14
82-
scalafix("0.15", Scio.`0.14`, Scio.`0.15`), // Scio 0.15
87+
scalafix("0.15", Scio.`0.14`, Scio.`0.15`) // Scio 0.15
8388
)
8489

8590
lazy val `input-0_7` = scalafixProjects("0.7").input

scalafix/project/ScalafixProject.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object ScalafixProject {
2424
implicit class ScalafixRowImplicit(pm: ProjectMatrix) {
2525
def scalafixRows(scalafixes: List[ScalafixProject], rules: Project): ProjectMatrix = {
2626
scalafixes match {
27-
case Nil => pm
27+
case Nil => pm
2828
case head :: tail => head.scalafixRow(pm, rules).scalafixRows(tail, rules)
2929
}
3030
}

scio-managed/src/main/scala/com/spotify/scio/iceberg/IcebergIO.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ private[scio] object ConfigMap {
5050
val label = toSnakeCase(p.label)
5151
val fieldValue = p.dereference(value)
5252
fieldValue match {
53-
case null => None
54-
case x: Option[_] => x.map { v => label -> v.asInstanceOf[AnyRef] }
55-
case _ =>
53+
case null => None
54+
case x: Option[_] => x.map(v => label -> v.asInstanceOf[AnyRef])
55+
case _ =>
5656
Some(label -> fieldValue.asInstanceOf[AnyRef])
5757
}
5858
}.toMap

scio-managed/src/main/scala/com/spotify/scio/iceberg/syntax/IcebergSCollectionSyntax.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ class IcebergSCollectionSyntax[T: RowType: Coder](self: SCollection[T]) {
4444
val params = IcebergIO.WriteParam(
4545
catalogProperties,
4646
configProperties,
47-
Option(triggeringFrequencySeconds).filter(_ != IcebergIO.WriteParam.DefaultTriggeringFrequencySeconds),
47+
Option(triggeringFrequencySeconds).filter(
48+
_ != IcebergIO.WriteParam.DefaultTriggeringFrequencySeconds
49+
),
4850
Option(directWriteByteLimit).filter(_ != IcebergIO.WriteParam.DefaultDirectWriteByteLimit),
4951
keep,
5052
drop,

0 commit comments

Comments
 (0)