Skip to content

Commit 6312d2b

Browse files
[3.0.x] Patch updates (#1301)
* [3.0.x] logback-classic 1.5.32 (was 1.5.22) * [3.0.x] sbt-mima-plugin 1.1.5 (was 1.1.4) * [3.0.x] scalafmt-core 3.10.7 (was 3.10.2) * Reformat with scalafmt 3.10.7 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.10.7' to .git-blame-ignore-revs
1 parent ad7fa0a commit 6312d2b

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ d8bad178bf2c2e6648f67a2094a15e3c4ed17613
1818

1919
# Scala Steward: Reformat with scalafmt 3.9.7
2020
b660a2f6013796c6f9a5edfe7fce3a93e83b235e
21+
22+
# Scala Steward: Reformat with scalafmt 3.10.7
23+
0ec06641d6b282cf01cbe2d65b26af6cddde5470

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.10.2
1+
version = 3.10.7
22
runner.dialect = Scala213Source3
33

44
align.preset = true

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ lazy val `play-jsonJVM` = `play-json`.jvm
237237
else
238238
specs2(scalaVersion.value)
239239
} :+ (
240-
"ch.qos.logback" % "logback-classic" % "1.5.22" % Test
240+
"ch.qos.logback" % "logback-classic" % "1.5.32" % Test
241241
),
242242
Test / unmanagedSourceDirectories ++= (docsP / PlayDocsKeys.scalaManualSourceDirectories).value,
243243
)

play-json/shared/src/main/scala-2/play/api/libs/json/JsMacroImpl.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class JsMacroImpl(val c: blackbox.Context) {
427427

428428
// Find an apply method that matches the unapply
429429
private val maybeApply: Option[MethodSymbol] = applies.collectFirst {
430-
case (apply: MethodSymbol) if hasVarArgs && {
430+
case apply: MethodSymbol if hasVarArgs && {
431431
// Option[List[c.universe.Type]]
432432
val someApplyTypes = apply.paramLists.headOption.map(_.map(_.asTerm.typeSignature))
433433

@@ -445,7 +445,7 @@ class JsMacroImpl(val c: blackbox.Context) {
445445
} =>
446446
apply
447447

448-
case (apply: MethodSymbol) if {
448+
case apply: MethodSymbol if {
449449
val applyParams = apply.paramLists.headOption.toList.flatMap(identity).map(_.typeSignature)
450450
val unapplyParams = unapplyReturnTypes.toList.flatMap(identity)
451451

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse(
88

99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
1010

11-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
11+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")
1212

1313
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
1414

0 commit comments

Comments
 (0)