Merge branch 'main' into dependabot/gradle/com.facebook-ktfmt-0.36

Author: nedtwigg

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.4.2'
+		id 'com.diffplug.spotless'                 version '6.5.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.21.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases