diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt index e61706b3..6e7feabe 100644 --- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt +++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt @@ -14,6 +14,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure +import org.gradle.kotlin.dsl.withGroovyBuilder import org.gradle.kotlin.dsl.withType @Suppress("Unused") @@ -26,13 +27,15 @@ class SpotlessPlugin : Plugin { project.pluginManager.apply(SpotlessPlugin::class) project.extensions.configure { kotlin { - ktfmt(KTFMT_VERSION).googleStyle() + // https://github.com/diffplug/spotless/pull/1890#issuecomment-1827263031 + @Suppress("INACCESSIBLE_TYPE") ktfmt(KTFMT_VERSION).withGroovyBuilder { "googleStyle"() } target("**/*.kt") targetExclude("**/build/", "/spotless/") licenseHeaderFile(project.file("spotless/license.kt")) } kotlinGradle { - ktfmt(KTFMT_VERSION).googleStyle() + // https://github.com/diffplug/spotless/pull/1890#issuecomment-1827263031 + @Suppress("INACCESSIBLE_TYPE") ktfmt(KTFMT_VERSION).withGroovyBuilder { "googleStyle"() } target("**/*.kts") targetExclude("**/build/") licenseHeaderFile(project.file("spotless/license.kt"), "import|plugins|@file") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52069efb..1c50b811 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ build-cachefix = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.grad build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } build-semver = "com.vdurmont:semver4j:3.1.0" build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:3.14.0" -build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.22.0" +build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.23.0" build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.8.1" build-versions = "com.github.ben-manes:gradle-versions-plugin:0.49.0" coil = { module = "io.coil-kt:coil", version.ref = "coil" }