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.

Sign up for GitHub

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

Patch updates #1109

Merged
merged 8 commits into from
Feb 23, 2025
+37 −29
Merged

Patch updates #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b88778f
logback-classic 1.5.16 (was 1.5.12)
scala-steward Feb 23, 2025
d7ed7c0
joda-time 2.13.1 (was 2.13.0)
scala-steward Feb 23, 2025
e4dbd86
play-docs-sbt-plugin 3.0.6 (was 3.0.5)
scala-steward Feb 23, 2025
d7697ee
sbt-scalajs 1.18.2 (was 1.18.1)
scala-steward Feb 23, 2025
6677c4f
sbt-scalafmt 2.5.4 (was 2.5.2)
scala-steward Feb 23, 2025
ddc8226
scalafmt-core 3.8.6 (was 3.8.3)
scala-steward Feb 23, 2025
59f4889
Reformat with scalafmt 3.8.6
scala-steward Feb 23, 2025
77af313
Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs
scala-steward Feb 23, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ d284d98d04e21841acd9c5cd4640279c877459c6

# Scala Steward: Reformat with scalafmt 3.8.2
aea577073fb21a3abae14915dc7c556e13592c16

# Scala Steward: Reformat with scalafmt 3.8.6
59f48891eca2bd9682aa3bcddedbeae290270ba0
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.6
runner.dialect = Scala213Source3

align.preset = true
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ val jacksons = Seq(
).map(_ % jacksonVersion) ++ jacksonDatabind

val joda = Seq(
"joda-time" % "joda-time" % "2.13.0"
"joda-time" % "joda-time" % "2.13.1"
)

// Common settings
Expand Down Expand Up @@ -251,7 +251,7 @@ lazy val `play-jsonJVM` = `play-json`.jvm
else
specs2(scalaVersion.value)
} :+ (
"ch.qos.logback" % "logback-classic" % "1.5.12" % Test
"ch.qos.logback" % "logback-classic" % "1.5.16" % Test
),
Test / unmanagedSourceDirectories ++= (docsP / PlayDocsKeys.scalaManualSourceDirectories).value,
)
Expand Down
30 changes: 18 additions & 12 deletions play-functional/src/main/scala/play/api/libs/functional/Products.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3000,8 +3000,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
}
)

Expand Down Expand Up @@ -3061,8 +3062,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
},
(b: B) => {
val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) = f2(b);
Expand Down Expand Up @@ -3408,8 +3410,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
}
)

Expand Down Expand Up @@ -3472,8 +3475,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
},
(b: B) => {
val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21) = f2(b);
Expand Down Expand Up @@ -3805,8 +3809,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
}
)

Expand Down Expand Up @@ -3873,8 +3878,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
B
](
canBuild(m1, m2),
{ case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
{
case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
},
(b: B) => {
val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22) =
Expand Down
4 changes: 2 additions & 2 deletions play-json/shared/src/main/scala-3/play/api/libs/json/ImplicitResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private[json] trait ImplicitResolver[A] {

val neededGiven: Option[Term] = Implicits.search(neededGivenType) match {
case suc: ImplicitSearchSuccess => {
if (!selfRef) {
if !selfRef then {
Some(suc.tree)
} else {
tx.transformTree(suc.tree)(suc.tree.symbol) match {
Expand Down Expand Up @@ -251,7 +251,7 @@ private[json] trait ImplicitResolver[A] {
case _ => {
val sym = t.typeSymbol

if (sym.isTypeParam) {
if sym.isTypeParam then {
sym.name
} else {
typeName(sym)
Expand Down
17 changes: 8 additions & 9 deletions play-json/shared/src/main/scala-3/play/api/libs/json/QuotesHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,12 @@ private[json] trait QuotesHelper {
case Some(child) => {
val tpeSym = child.typeSymbol

if (
(tpeSym.flags.is(Flags.Abstract) &&
tpeSym.flags.is(Flags.Sealed) &&
!(child <:< anyValTpe)) ||
(tpeSym.flags.is(Flags.Sealed) &&
tpeSym.flags.is(Flags.Trait))
) {
if (tpeSym.flags.is(Flags.Abstract) &&
tpeSym.flags.is(Flags.Sealed) &&
!(child <:< anyValTpe)) ||
(tpeSym.flags.is(Flags.Sealed) &&
tpeSym.flags.is(Flags.Trait))
then {
// Ignore sub-trait itself, but check the sub-sub-classes
subclasses(tpeSym.children.map(_.tree) ::: children.tail, out)
} else {
Expand All @@ -87,7 +86,7 @@ private[json] trait QuotesHelper {

val types = subclasses(cls.children.map(_.tree), Nil)

if (types.isEmpty) None else Some(types)
if types.isEmpty then None else Some(types)
}

@annotation.tailrec
Expand Down Expand Up @@ -132,7 +131,7 @@ private[json] trait QuotesHelper {
val resolve: Term => Term = {
val field = tupleTpeSym.declaredField(fieldNme)

if (field == Symbol.noSymbol) {
if field == Symbol.noSymbol then {
tupleTpeSym.declaredMethod(fieldNme) match {
case meth :: Nil =>
(_: Term).select(meth)
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

resolvers ++= DefaultOptions.resolvers(snapshot = true)

addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.5"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.6"))

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
Loading