From 62f89497682de87a57a7cc9c380a54297992d87f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 06:33:18 +0000 Subject: [PATCH 1/4] Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cd8dcde46a..a1a932e813 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -80,7 +80,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.github.johnrengelman:shadow", version = "8.1.1" } -pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.22.0" } +pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.23.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" } From 22fd25b8909a4902fb14b43b633d1b4a5220ecc3 Mon Sep 17 00:00:00 2001 From: Benoit Quenaudon Date: Mon, 27 Nov 2023 10:04:52 +0000 Subject: [PATCH 2/4] Bumping ktlint as well --- .../kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt b/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt index 040098710e..6dec8ec793 100644 --- a/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt +++ b/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt @@ -147,7 +147,7 @@ class WireBuildPlugin : Plugin { endWithNewline() toggleOffOn() lineEndings = LineEnding.UNIX - ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf("ktlint_standard_filename" to "disabled")) + ktlint(libs.versions.ktlint.get()) licenseHeaderFile(licenseHeaderFile) } if (path != ":") { From 2b285689351113424d830d498fcaf5fb5f4969af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= Date: Fri, 1 Dec 2023 07:09:03 -0500 Subject: [PATCH 3/4] Update gradle/libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1a932e813..60a956e980 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -80,7 +80,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.github.johnrengelman:shadow", version = "8.1.1" } -pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.23.0" } +pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.23.2" } 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" } From d8a24c55768fd12bccee7bfd88eef398b6aba3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= Date: Fri, 1 Dec 2023 07:09:07 -0500 Subject: [PATCH 4/4] Update build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt --- .../kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt b/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt index 6dec8ec793..040098710e 100644 --- a/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt +++ b/build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt @@ -147,7 +147,7 @@ class WireBuildPlugin : Plugin { endWithNewline() toggleOffOn() lineEndings = LineEnding.UNIX - ktlint(libs.versions.ktlint.get()) + ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf("ktlint_standard_filename" to "disabled")) licenseHeaderFile(licenseHeaderFile) } if (path != ":") { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60a956e980..5be539de5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -80,7 +80,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.github.johnrengelman:shadow", version = "8.1.1" } -pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.23.2" } +pluginz-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.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" }