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 #950

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Patch updates #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81e1d4e
scalafmt-core 3.7.17 (was 3.7.15)
scala-steward Nov 17, 2023
07656d2
Reformat with scalafmt 3.7.17
scala-steward Nov 17, 2023
343d9b9
Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs
scala-steward Nov 17, 2023
31b1cb3
specs2-core 4.20.3 (was 4.20.2)
scala-steward Nov 17, 2023
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 @@ -6,3 +6,6 @@

# Scala Steward: Reformat with scalafmt 3.7.5
d284d98d04e21841acd9c5cd4640279c877459c6

# Scala Steward: Reformat with scalafmt 3.7.17
07656d26503cb1f6037231eef6fb742961e23d95
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.7.15
version = 3.7.17
runner.dialect = Scala213Source3

align.preset = true
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ val isScala3 = Def.setting {

def specs2(scalaVersion: String) =
Seq("core", "junit").map { n =>
("org.specs2" %% s"specs2-$n" % "4.20.2") % Test
("org.specs2" %% s"specs2-$n" % "4.20.3") % Test
}

val jacksonDatabindVersion = "2.14.3"
Expand Down
3 changes: 2 additions & 1 deletion play-json/shared/src/main/scala-2.13-/play/api/libs/json/ImmutableLinkedHashMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import scala.collection.mutable.ArrayBuffer
private[json] class ImmutableLinkedHashMap[A, +B](underlying: JLinkedHashMap[A, B])
extends AbstractMap[A, B]
with Map[A, B]
with MapLike[A, B, ImmutableLinkedHashMap[A, B]] with Serializable {
with MapLike[A, B, ImmutableLinkedHashMap[A, B]]
with Serializable {

override def get(key: A): Option[B] = Option(underlying.get(key))

Expand Down
Loading