Bump com.diffplug.spotless:spotless-plugin-gradle from 6.21.0 to 6.25…

….0 (#266) * Bump com.diffplug.spotless:spotless-plugin-gradle from 6.21.0 to 6.25.0 Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.21.0 to 6.25.0. - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](diffplug/spotless@gradle/6.21.0...gradle/6.25.0) --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix linting --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Parmet <[email protected]>
open-toast · May 20, 2024 · d512f7a · d512f7a
1 parent 72c904d
commit d512f7a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 16 deletions.
diff --git a/buildSrc/src/main/kotlin/RemotePublishing.kt b/buildSrc/src/main/kotlin/RemotePublishing.kt
@@ -43,9 +43,9 @@ private object Pgp {
 }
 
 object ProtoktProjectInfo {
-    const val name = "Protokt"
-    const val url = "https://github.com/open-toast/protokt"
-    const val description = "Protobuf compiler and runtime for Kotlin"
+    const val NAME = "Protokt"
+    const val URL = "https://github.com/open-toast/protokt"
+    const val DESCRIPTION = "Protobuf compiler and runtime for Kotlin"
 }
 
 fun Project.isRelease() = !version.toString().endsWith("-SNAPSHOT")
@@ -64,10 +64,10 @@ fun Project.enablePublishing(defaultJars: Boolean = true) {
 
     configure<MavenPublishBaseExtension> {
         pom {
-            name.set(ProtoktProjectInfo.name)
-            description.set(ProtoktProjectInfo.description)
-            url.set(ProtoktProjectInfo.url)
-            scm { url.set(ProtoktProjectInfo.url) }
+            name.set(ProtoktProjectInfo.NAME)
+            description.set(ProtoktProjectInfo.DESCRIPTION)
+            url.set(ProtoktProjectInfo.URL)
+            scm { url.set(ProtoktProjectInfo.URL) }
             licenses {
                 license {
                     name.set("The Apache License, Version 2.0")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ gummyBears = "0.8.0"
 java = "11"
 kotlin = "1.9.23"
 pluginPublish = "1.2.1"
-spotless = "6.21.0"
+spotless = "6.25.0"
 
 # benchmarks
 datasets = "0.1.0"

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/MessageGenerator.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/MessageGenerator.kt
@@ -230,7 +230,8 @@ private class MessageGenerator(
 
 fun formatDoc(lines: List<String>) =
     CodeBlock.of(
-        "%L", // escape the entire comment block
+        // escape the entire comment block
+        "%L",
         lines.joinToString(" ") {
             if (it.isBlank()) {
                 "\n\n"

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/SerializerGenerator.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/SerializerGenerator.kt
@@ -67,7 +67,11 @@ internal fun serialize(
             interceptValueAccess(
                 f,
                 ctx,
-                if (f.repeated) { CodeBlock.of("it") } else { CodeBlock.of("%N", p) }
+                if (f.repeated) {
+                    CodeBlock.of("it")
+                } else {
+                    CodeBlock.of("%N", p)
+                }
             )
         } else {
             interceptValueAccess(f, ctx, CodeBlock.of("%N.%N", o.fieldName, f.fieldName))

diff --git a/protokt-codegen/src/test/kotlin/protokt/v1/codegen/AbstractProtoktCodegenTest.kt b/protokt-codegen/src/test/kotlin/protokt/v1/codegen/AbstractProtoktCodegenTest.kt
@@ -76,7 +76,10 @@ abstract class AbstractProtoktCodegenTest {
         listOf(
             System.getenv("PROTOC_PATH") ?: "protoc",
             "--plugin=protoc-gen-custom=$binGenerator",
-            "--custom_out=.", // ignored
+
+            // ignored
+            "--custom_out=.",
+
             "-I$testDir",
             "-I$extensionsProto",
             "-I$includeProtos",

diff --git a/protokt-gradle-plugin/build.gradle.kts b/protokt-gradle-plugin/build.gradle.kts
@@ -21,15 +21,15 @@ plugins {
 }
 
 gradlePlugin {
-    website.set(ProtoktProjectInfo.url)
-    vcsUrl.set(ProtoktProjectInfo.url)
+    website.set(ProtoktProjectInfo.URL)
+    vcsUrl.set(ProtoktProjectInfo.URL)
 
     plugins {
         create("protokt") {
             id = "com.toasttab.protokt"
             implementationClass = "protokt.v1.gradle.ProtoktPlugin"
-            displayName = ProtoktProjectInfo.name
-            description = ProtoktProjectInfo.description
+            displayName = ProtoktProjectInfo.NAME
+            description = ProtoktProjectInfo.DESCRIPTION
             tags.set(listOf("protobuf", "kotlin"))
         }
     }

diff --git a/protokt-runtime-grpc-lite/src/jsMain/kotlin/protokt/v1/grpc/GrpcJs.kt b/protokt-runtime-grpc-lite/src/jsMain/kotlin/protokt/v1/grpc/GrpcJs.kt
@@ -78,6 +78,7 @@ external interface ServerWritableStream<ReqT, RespT> : ServerSurfaceCall, Object
 
 @Beta
 external interface ObjectWritable<T> : Writable {
+    @Suppress("ktlint:standard:function-naming")
     fun _write(chunk: T, encoding: String, callback: Any)
     fun write(chunk: T, callback: Any?): Boolean
     fun write(chunk: T, encoding: Any?, callback: Any?): Boolean

diff --git a/testing/testing-util/src/main/kotlin/protokt/v1/testing/ProcessUtils.kt b/testing/testing-util/src/main/kotlin/protokt/v1/testing/ProcessUtils.kt
@@ -71,6 +71,7 @@ data class ProcessOutput(
     }
 
     enum class Src {
-        OUT, ERR
+        OUT,
+        ERR
     }
 }