Merge pull request #1219 from scala-steward/update/2.2.x/patches

[2.2.x] Patch updates

Author: mkurz

.scalafmt.conf

@@ -11,4 +11,4 @@ rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abst
 spaces.inImportCurlyBraces = true   # more idiomatic to include whitepsace in import x.{ yyy }
 trailingCommas = preserve
 newlines.afterCurlyLambda = preserve
-version = 3.10.4
+version = 3.10.5