Update Spotless and Ktfmt

build.gradle.kts

@@ -167,7 +167,7 @@ testing.suites {
               // Prettify test failure output in console.
               result.exception?.message?.lineSequence()?.firstOrNull()?.let(logger::error)
             }
-          }
+          },
         )
       }
     }

gradle/build-logic/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/buildlogic/GenerateDocTests.kt

@@ -48,7 +48,7 @@ abstract class GenerateDocTests : DefaultTask() {
                   lineNumber = line,
                   snippet = matcher.group(2),
                   sourceLocation = "${file.toURI()}:$line",
-                )
+                ),
               )
             }
           }
@@ -112,7 +112,7 @@ abstract class GenerateDocTests : DefaultTask() {
             |}
             |
             """
-              .trimMargin()
+              .trimMargin(),
           )
       }
   }

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ pluginPublish = { module = "com.gradle.plugin-publish:com.gradle.plugin-publish.
 
 androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0"
 # Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.
-ktfmt = "com.facebook:ktfmt:0.64"
+ktfmt = "org.jetbrains.kotlinx:ktfmt:0.65"
 r8 = "com.android.tools:r8:9.5.23"
 
 junit-bom = "org.junit:junit-bom:6.1.3"
@@ -38,5 +38,5 @@ android-lint = "com.android.lint:9.4.1"
 jetbrains-dokka = "org.jetbrains.dokka:2.3.0-Beta"
 mavenPublish = "com.vanniktech.maven.publish:0.37.0"
 pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" }
-spotless = "com.diffplug.spotless:8.10.3"
+spotless = "com.diffplug.spotless:8.10.4"
 buildConfig = "com.github.gmazzo.buildconfig:6.1.2"

src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/SnippetExecutable.kt

@@ -49,7 +49,7 @@ sealed interface SnippetExecutable {
         |enableFeaturePreview 'STABLE_CONFIGURATION_CACHE'
         |enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
         """
-            .trimMargin()
+            .trimMargin(),
         )
       val pluginsBlock =
         """

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt

@@ -119,7 +119,7 @@ class ApplicationPluginTest : BasePluginTest() {
         |Hello, World! (bar) from Main
         |Refs: junit.framework.Test
         |"""
-          .trimMargin()
+          .trimMargin(),
       )
   }
 
@@ -144,7 +144,7 @@ class ApplicationPluginTest : BasePluginTest() {
         |  }
         |}
         """
-          .trimMargin()
+          .trimMargin(),
     )
 
     var result = runWithSuccess(runShadowPath)
@@ -169,7 +169,7 @@ class ApplicationPluginTest : BasePluginTest() {
       |  args 'bar'
       |}
       """
-        .trimMargin()
+        .trimMargin(),
     )
 
     result = runWithSuccess(":run")
@@ -186,7 +186,7 @@ class ApplicationPluginTest : BasePluginTest() {
       |  mainClass = 'my.Main2' // Different from application.mainClass.
       |}
       """
-        .trimMargin()
+        .trimMargin(),
     )
 
     runWithSuccess(runShadowPath) // Run without errors.
@@ -278,7 +278,7 @@ class ApplicationPluginTest : BasePluginTest() {
         |applicationName = '${applicationNames.first}'
         |executableDir = '${executableDirs.first}'
         """
-          .trimMargin()
+          .trimMargin(),
     )
 
     runWithSuccess(installShadowDistPath, shadowDistZipPath)
@@ -328,13 +328,13 @@ class ApplicationPluginTest : BasePluginTest() {
       |}
       |
       """
-        .trimMargin()
+        .trimMargin(),
     )
     settingsScript.writeText(
       getDefaultSettingsBuildScript(
         startBlock = settingsBlock,
         endBlock = "rootProject.name = 'myapp'",
-      )
+      ),
     )
   }
 

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

@@ -249,7 +249,7 @@ abstract class BasePluginTest {
       """
       |include 'client', 'server'
       """
-        .trimMargin()
+        .trimMargin(),
     )
     projectScript.deleteExisting()
 
@@ -259,7 +259,7 @@ abstract class BasePluginTest {
         |package client;
         |public class Client {}
         """
-          .trimMargin()
+          .trimMargin(),
       )
     path("client/build.gradle")
       .writeText(
@@ -270,7 +270,7 @@ abstract class BasePluginTest {
         |}
         |
         """
-          .trimMargin()
+          .trimMargin(),
       )
 
     path("server/src/main/java/server/Server.java")
@@ -280,7 +280,7 @@ abstract class BasePluginTest {
         |import client.Client;
         |public class Server {}
         """
-          .trimMargin()
+          .trimMargin(),
       )
     path("server/build.gradle")
       .writeText(
@@ -294,7 +294,7 @@ abstract class BasePluginTest {
         |}
         |
         """
-          .trimMargin()
+          .trimMargin(),
       )
 
     if (!clientShadowed) return
@@ -306,7 +306,7 @@ abstract class BasePluginTest {
         |}
         |
         """
-          .trimMargin()
+          .trimMargin(),
       )
     path("server/src/main/java/server/Server.java")
       .writeText(
@@ -316,7 +316,7 @@ abstract class BasePluginTest {
         |import client.junit.framework.Test;
         |public class Server {}
         """
-          .trimMargin()
+          .trimMargin(),
       )
     val replaced =
       path("server/build.gradle")
@@ -338,7 +338,7 @@ abstract class BasePluginTest {
       |}
       |
       """
-        .trimMargin()
+        .trimMargin(),
     )
 
     path("src/main/java/my/plugin/MyPlugin.java")
@@ -353,7 +353,7 @@ abstract class BasePluginTest {
         |  }
         |}
         """
-          .trimMargin()
+          .trimMargin(),
       )
   }