Merge branch 'main' into renovate/com.palantir.javaformat-palantir-java-format-2.x

Author: nedtwigg

testlib/src/main/resources/scala/scalafmt/scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.5.9
+version = 3.6.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display