Update dependency com.diffplug.spotless:spotless-plugin-gradle to v8

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ kotlin = "2.2.21"
 # Set to lower version than KGP version to maximize compatibility
 kotlinCoreLibrariesVersion = "2.0.21"
 kotlinpoet = "2.3.0"
-ktlint = "0.48.2"
+ktlint = "1.5.0"
 moshi = "1.15.2"
 okhttp = "5.3.2"
 okio = "3.17.0"
@@ -84,7 +84,7 @@ pluginz-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.re
 pluginz-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 pluginz-kotlinSerialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 pluginz-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.10" }
-pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.2.1" }
+pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.4.0" }
 pluginz-buildConfig = { module = "com.github.gmazzo:gradle-buildconfig-plugin", version = "3.1.0" }
 protobuf-gradlePlugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobufGradlePlugin" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }

samples/wire-grpc-sample/client/src/main/java/com/squareup/wire/whiteboard/MainActivity.kt

@@ -33,7 +33,9 @@ import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class MainActivity : ComponentActivity(), OnBoardEventListener {
+class MainActivity :
+  ComponentActivity(),
+  OnBoardEventListener {
   private lateinit var sendCommandChannel: SendChannel<WhiteboardCommand>
   private lateinit var receiveUpdateChannel: ReceiveChannel<WhiteboardUpdate>
   private lateinit var whiteboardView: WhiteboardView

samples/wire-grpc-sample/server/src/main/java/com/squareup/wire/whiteboard/WhiteboardGrpcAction.kt

@@ -23,7 +23,9 @@ import javax.inject.Singleton
 import misk.web.actions.WebAction
 
 @Singleton
-class WhiteboardGrpcAction : WebAction, WhiteboardWhiteboardBlockingServer {
+class WhiteboardGrpcAction :
+  WebAction,
+  WhiteboardWhiteboardBlockingServer {
   val clients = mutableListOf<Client>()
   val points = mutableListOf<Point>()
 

wire-benchmarks/src/main/kotlin/com/squareup/wire/benchmarks/SampleData.kt

@@ -64,17 +64,15 @@ object SampleData {
   """.trimMargin()
 
   @JvmStatic
-  fun newMediumValueWire(): EmailSearchResponseWire {
-    return EmailSearchResponseWire(
-      query = recipientDisplayName,
-      results = listOf(
-        EmailThreadWire(
-          subject = subject,
-          messages = listOf(newEmailMessageWire()),
-        ),
+  fun newMediumValueWire(): EmailSearchResponseWire = EmailSearchResponseWire(
+    query = recipientDisplayName,
+    results = listOf(
+      EmailThreadWire(
+        subject = subject,
+        messages = listOf(newEmailMessageWire()),
       ),
-    )
-  }
+    ),
+  )
 
   private fun newEmailMessageWire() = EmailMessageWire(
     sent_at = sentAt,
@@ -95,19 +93,17 @@ object SampleData {
   )
 
   @JvmStatic
-  fun newMediumValueProtobuf(): EmailSearchResponseProtobuf {
-    return EmailSearchResponseProtobuf.newBuilder()
-      .apply {
-        query = recipientDisplayName
-        addResults(
-          EmailThreadProtobuf.newBuilder()
-            .apply {
-              subject = SampleData.subject
-              addMessages(newEmailMessageProtobuf())
-            }.build(),
-        )
-      }.build()
-  }
+  fun newMediumValueProtobuf(): EmailSearchResponseProtobuf = EmailSearchResponseProtobuf.newBuilder()
+    .apply {
+      query = recipientDisplayName
+      addResults(
+        EmailThreadProtobuf.newBuilder()
+          .apply {
+            subject = SampleData.subject
+            addMessages(newEmailMessageProtobuf())
+          }.build(),
+      )
+    }.build()
 
   private fun newEmailMessageProtobuf() = EmailMessageProtobuf.newBuilder()
     .apply {

wire-compiler/src/main/java/com/squareup/wire/WireCompiler.kt

@@ -329,9 +329,7 @@ class WireCompiler internal constructor(
       fileSystem: NioFileSystem,
       logger: WireLogger,
       vararg args: String,
-    ): WireCompiler {
-      return forArgs(fileSystem.asOkioFileSystem(), logger, *args)
-    }
+    ): WireCompiler = forArgs(fileSystem.asOkioFileSystem(), logger, *args)
 
     @Throws(WireException::class)
     @JvmOverloads