From 04db9d7006748ff5f0430ea2a459af2e9595f515 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:25:44 -0500
Subject: [PATCH] Bump com.diffplug.spotless from 6.11.0 to 6.19.0 (#140)
Bumps com.diffplug.spotless from 6.11.0 to 6.19.0.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Philip K. Warren
---
gradle/libs.versions.toml | 2 +-
src/main/kotlin/build/buf/gradle/ArtifactDetailsSupport.kt | 2 +-
src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt | 2 +-
src/main/kotlin/build/buf/gradle/BreakingTask.kt | 2 +-
src/main/kotlin/build/buf/gradle/BufExtension.kt | 4 ++--
src/main/kotlin/build/buf/gradle/BufSupport.kt | 4 ++--
.../buf/gradle/DirectorySpecificBufExecutionSupport.kt | 6 +++---
src/main/kotlin/build/buf/gradle/LintTask.kt | 2 +-
src/main/kotlin/build/buf/gradle/ProcessRunner.kt | 2 +-
.../kotlin/build/buf/gradle/ProtobufGradlePluginSupport.kt | 6 +++---
src/test/kotlin/build/buf/gradle/AbstractBreakingTest.kt | 2 +-
.../kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt | 4 ++--
src/test/kotlin/build/buf/gradle/AbstractFormatApplyTest.kt | 4 ++--
src/test/kotlin/build/buf/gradle/AbstractFormatCheckTest.kt | 2 +-
src/test/kotlin/build/buf/gradle/AbstractLintTest.kt | 2 +-
.../build/buf/gradle/FormatApplyWithProtobufGradleTest.kt | 4 ++--
16 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 654bcf60..f0663bf2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ animalsniffer = "1.5.4"
kotlin = "1.6.20"
pluginPublish = "1.1.0"
publishing = "0.22.0"
-spotless = "6.11.0"
+spotless = "6.19.0"
# signature
java8Signature = "1.0"
diff --git a/src/main/kotlin/build/buf/gradle/ArtifactDetailsSupport.kt b/src/main/kotlin/build/buf/gradle/ArtifactDetailsSupport.kt
index c8e63beb..ff086a48 100644
--- a/src/main/kotlin/build/buf/gradle/ArtifactDetailsSupport.kt
+++ b/src/main/kotlin/build/buf/gradle/ArtifactDetailsSupport.kt
@@ -28,7 +28,7 @@ internal fun Project.getArtifactDetails(): ArtifactDetails? {
ArtifactDetails(
it.groupId,
"${it.artifactId}-bufbuild",
- it.version
+ it.version,
)
} ?: publications.size
} else {
diff --git a/src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt b/src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt
index 72f7484e..385b4282 100644
--- a/src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt
+++ b/src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt
@@ -45,7 +45,7 @@ private fun Project.addSchemaDependency(artifactDetails: ArtifactDetails) {
createConfigurationWithDependency(
BUF_BREAKING_CONFIGURATION_NAME,
- "${artifactDetails.groupAndArtifact()}:$versionSpecifier"
+ "${artifactDetails.groupAndArtifact()}:$versionSpecifier",
)
}
diff --git a/src/main/kotlin/build/buf/gradle/BreakingTask.kt b/src/main/kotlin/build/buf/gradle/BreakingTask.kt
index 5f32f88c..57d86aa2 100644
--- a/src/main/kotlin/build/buf/gradle/BreakingTask.kt
+++ b/src/main/kotlin/build/buf/gradle/BreakingTask.kt
@@ -24,7 +24,7 @@ abstract class BreakingTask : DefaultTask() {
"breaking",
bufBuildPublicationFile,
"--against",
- singleFileFromConfiguration(BUF_BREAKING_CONFIGURATION_NAME)
+ singleFileFromConfiguration(BUF_BREAKING_CONFIGURATION_NAME),
) {
"""
|Some Protobuf files had breaking changes:
diff --git a/src/main/kotlin/build/buf/gradle/BufExtension.kt b/src/main/kotlin/build/buf/gradle/BufExtension.kt
index 57b714ff..8f4b6c2d 100644
--- a/src/main/kotlin/build/buf/gradle/BufExtension.kt
+++ b/src/main/kotlin/build/buf/gradle/BufExtension.kt
@@ -73,7 +73,7 @@ open class BufExtension {
class ArtifactDetails(
var groupId: String? = null,
var artifactId: String? = null,
- var version: String? = null
+ var version: String? = null,
)
class GenerateOptions(
@@ -86,5 +86,5 @@ class GenerateOptions(
/**
* Specify the location of buf.gen.yaml if not using one in the project root.
*/
- var templateFileLocation: File? = null
+ var templateFileLocation: File? = null,
)
diff --git a/src/main/kotlin/build/buf/gradle/BufSupport.kt b/src/main/kotlin/build/buf/gradle/BufSupport.kt
index e52998e5..ed8e3e9e 100644
--- a/src/main/kotlin/build/buf/gradle/BufSupport.kt
+++ b/src/main/kotlin/build/buf/gradle/BufSupport.kt
@@ -46,8 +46,8 @@ internal fun Project.configureBufDependency() {
"name" to "buf",
"version" to extension.toolVersion,
"classifier" to "$osPart-$archPart",
- "ext" to "exe"
- )
+ "ext" to "exe",
+ ),
)
}
diff --git a/src/main/kotlin/build/buf/gradle/DirectorySpecificBufExecutionSupport.kt b/src/main/kotlin/build/buf/gradle/DirectorySpecificBufExecutionSupport.kt
index 0b800785..ae52d4b9 100644
--- a/src/main/kotlin/build/buf/gradle/DirectorySpecificBufExecutionSupport.kt
+++ b/src/main/kotlin/build/buf/gradle/DirectorySpecificBufExecutionSupport.kt
@@ -19,7 +19,7 @@ import java.io.File
internal fun Task.execBufInSpecificDirectory(
vararg bufCommand: String,
- customErrorMessage: ((String) -> String)? = null
+ customErrorMessage: ((String) -> String)? = null,
) {
execBufInSpecificDirectory(bufCommand.asList(), emptyList(), customErrorMessage)
}
@@ -27,7 +27,7 @@ internal fun Task.execBufInSpecificDirectory(
internal fun Task.execBufInSpecificDirectory(
bufCommand: String,
extraArgs: Iterable,
- customErrorMessage: ((String) -> String)
+ customErrorMessage: ((String) -> String),
) {
execBufInSpecificDirectory(listOf(bufCommand), extraArgs, customErrorMessage)
}
@@ -35,7 +35,7 @@ internal fun Task.execBufInSpecificDirectory(
private fun Task.execBufInSpecificDirectory(
bufCommand: Iterable,
extraArgs: Iterable,
- customErrorMessage: ((String) -> String)? = null
+ customErrorMessage: ((String) -> String)? = null,
) {
fun runWithArgs(file: File? = null) =
bufCommand + listOfNotNull(file?.let { project.makeMangledRelativizedPathStr(it) }) + extraArgs
diff --git a/src/main/kotlin/build/buf/gradle/LintTask.kt b/src/main/kotlin/build/buf/gradle/LintTask.kt
index 3e1da4ca..e2b192dc 100644
--- a/src/main/kotlin/build/buf/gradle/LintTask.kt
+++ b/src/main/kotlin/build/buf/gradle/LintTask.kt
@@ -25,7 +25,7 @@ abstract class LintTask : DefaultTask() {
fun bufLint() {
execBufInSpecificDirectory(
"lint",
- bufConfigFile()?.let { listOf("--config", it.readAndStripComments()) }.orEmpty()
+ bufConfigFile()?.let { listOf("--config", it.readAndStripComments()) }.orEmpty(),
) {
"""
|Some Protobuf files had lint violations:
diff --git a/src/main/kotlin/build/buf/gradle/ProcessRunner.kt b/src/main/kotlin/build/buf/gradle/ProcessRunner.kt
index 3b12ab5d..8a0c041c 100644
--- a/src/main/kotlin/build/buf/gradle/ProcessRunner.kt
+++ b/src/main/kotlin/build/buf/gradle/ProcessRunner.kt
@@ -53,7 +53,7 @@ internal class ProcessRunner : Closeable {
private val args: List,
val exitCode: Int,
val stdOut: ByteArray,
- val stdErr: ByteArray
+ val stdErr: ByteArray,
) {
override fun toString(): String {
val builder = StringBuilder()
diff --git a/src/main/kotlin/build/buf/gradle/ProtobufGradlePluginSupport.kt b/src/main/kotlin/build/buf/gradle/ProtobufGradlePluginSupport.kt
index fefa4bc6..57c6584f 100644
--- a/src/main/kotlin/build/buf/gradle/ProtobufGradlePluginSupport.kt
+++ b/src/main/kotlin/build/buf/gradle/ProtobufGradlePluginSupport.kt
@@ -63,7 +63,7 @@ abstract class CreateSymLinksToModulesTask : DefaultTask() {
logger.info("Creating symlink for $it at $symLinkFile")
Files.createSymbolicLink(
symLinkFile.toPath(),
- bufbuildDir.toPath().relativize(project.file(it).toPath())
+ bufbuildDir.toPath().relativize(project.file(it).toPath()),
)
}
}
@@ -96,7 +96,7 @@ private fun Task.workspaceCommonConfig() {
dependsOn(
project
.tasks
- .matching { it::class.java.name == "com.google.protobuf.gradle.ProtobufExtract_Decorated" }
+ .matching { it::class.java.name == "com.google.protobuf.gradle.ProtobufExtract_Decorated" },
)
createsOutput()
}
@@ -171,7 +171,7 @@ private fun mangle(name: Path) =
internal inline fun Project.registerBufTask(
name: String,
- noinline configuration: T.() -> Unit
+ noinline configuration: T.() -> Unit,
): TaskProvider {
val taskProvider = tasks.register(name, configuration)
withProtobufGradlePlugin {
diff --git a/src/test/kotlin/build/buf/gradle/AbstractBreakingTest.kt b/src/test/kotlin/build/buf/gradle/AbstractBreakingTest.kt
index 853772a0..8de6aca8 100644
--- a/src/test/kotlin/build/buf/gradle/AbstractBreakingTest.kt
+++ b/src/test/kotlin/build/buf/gradle/AbstractBreakingTest.kt
@@ -61,7 +61,7 @@ abstract class AbstractBreakingTest : AbstractBufIntegrationTest() {
"""
Execution failed for task ':bufBreaking'.
> Some Protobuf files had breaking changes:
- """.trimIndent().osIndependent()
+ """.trimIndent().osIndependent(),
)
assertThat(result.output).contains("Previously present message \"BasicMessage\" was deleted from file.")
}
diff --git a/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt b/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt
index c4dd1058..160834ee 100644
--- a/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt
+++ b/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt
@@ -54,7 +54,7 @@ abstract class AbstractBufIntegrationTest : IntegrationTest {
}
class WrappedRunner(
- private val delegate: GradleRunner
+ private val delegate: GradleRunner,
) {
fun withArguments(vararg args: String) =
WrappedRunner(delegate.withArguments(delegate.arguments + args))
@@ -74,7 +74,7 @@ abstract class AbstractBufIntegrationTest : IntegrationTest {
"-PprotobufGradleVersion=0.9.3",
"-PprotobufVersion=3.23.4",
"-PkotlinVersion=1.7.20",
- "-PandroidGradleVersion=7.3.0"
+ "-PandroidGradleVersion=7.3.0",
)
.let { WrappedRunner(it) }
diff --git a/src/test/kotlin/build/buf/gradle/AbstractFormatApplyTest.kt b/src/test/kotlin/build/buf/gradle/AbstractFormatApplyTest.kt
index d2ac704e..5d9bc0ad 100644
--- a/src/test/kotlin/build/buf/gradle/AbstractFormatApplyTest.kt
+++ b/src/test/kotlin/build/buf/gradle/AbstractFormatApplyTest.kt
@@ -44,7 +44,7 @@ abstract class AbstractFormatApplyTest : AbstractBufIntegrationTest() {
message Foo {}
- """.trimIndent()
+ """.trimIndent(),
)
}
@@ -54,7 +54,7 @@ abstract class AbstractFormatApplyTest : AbstractBufIntegrationTest() {
.withArguments(BUF_FORMAT_APPLY_TASK_NAME)
.build()
.task(":$BUF_FORMAT_APPLY_TASK_NAME")
- ?.outcome
+ ?.outcome,
).isEqualTo(SUCCESS)
assertThat(protoFile.toFile().readText()).isEqualTo(after)
diff --git a/src/test/kotlin/build/buf/gradle/AbstractFormatCheckTest.kt b/src/test/kotlin/build/buf/gradle/AbstractFormatCheckTest.kt
index 2e097943..a5298b2f 100644
--- a/src/test/kotlin/build/buf/gradle/AbstractFormatCheckTest.kt
+++ b/src/test/kotlin/build/buf/gradle/AbstractFormatCheckTest.kt
@@ -52,7 +52,7 @@ abstract class AbstractFormatCheckTest : AbstractBufIntegrationTest() {
| +message Foo {}
|
| Run './gradlew :bufFormatApply' to fix these violations.
- """.trimMargin()
+ """.trimMargin(),
)
}
diff --git a/src/test/kotlin/build/buf/gradle/AbstractLintTest.kt b/src/test/kotlin/build/buf/gradle/AbstractLintTest.kt
index 6b19572b..2867947f 100644
--- a/src/test/kotlin/build/buf/gradle/AbstractLintTest.kt
+++ b/src/test/kotlin/build/buf/gradle/AbstractLintTest.kt
@@ -58,7 +58,7 @@ abstract class AbstractLintTest : LintTestUtilities, AbstractBufIntegrationTest(
"""
Execution failed for task ':bufLint'.
> Some Protobuf files had lint violations:
- """.trimIndent().osIndependent()
+ """.trimIndent().osIndependent(),
)
assertThat(result.output).contains("Enum zero value name \"TEST_FOO\" should be suffixed with \"_UNSPECIFIED\"")
}
diff --git a/src/test/kotlin/build/buf/gradle/FormatApplyWithProtobufGradleTest.kt b/src/test/kotlin/build/buf/gradle/FormatApplyWithProtobufGradleTest.kt
index 5c88a4d7..fc786107 100644
--- a/src/test/kotlin/build/buf/gradle/FormatApplyWithProtobufGradleTest.kt
+++ b/src/test/kotlin/build/buf/gradle/FormatApplyWithProtobufGradleTest.kt
@@ -43,7 +43,7 @@ class FormatApplyWithProtobufGradleTest : AbstractFormatApplyTest() {
message BasicMessage {}
""".trimIndent(),
- Paths.get(projectDir.path, "subdir", "buf", "test", "v1", "test.proto")
+ Paths.get(projectDir.path, "subdir", "buf", "test", "v1", "test.proto"),
)
}
@@ -77,7 +77,7 @@ class FormatApplyWithProtobufGradleTest : AbstractFormatApplyTest() {
protokt.ProtoktFileOptions protokt_file_options = 2;
}
- """.trimIndent()
+ """.trimIndent(),
)
}