Skip to content

Commit fafb13f

Browse files
committed
chore: spotless fix
1 parent 9e80215 commit fafb13f

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

plugins/project/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.diffplug.spotless.kotlin.KtfmtStep
21
import common.*
32
import java.time.Year
43
import org.hildan.github.changelog.plugin.GitHubChangelogExtension
@@ -83,34 +82,41 @@ dokka {
8382
}
8483

8584
spotless {
86-
java {
87-
// googleJavaFormat(libs.versions.google.javaformat.get())
88-
palantirJavaFormat(libs.versions.palantir.javaformat.get()).formatJavadoc(true)
89-
target("**/*.java_disabled")
85+
pluginManager.withPlugin("java") {
86+
java {
87+
palantirJavaFormat(libs.versions.palantir.javaformat.get()).formatJavadoc(true)
88+
target("src/**/*.java")
89+
targetExclude("**/build/**", "**/generated/**")
90+
}
9091
}
91-
// if(plugins.hasPlugin(JavaPlugin::class.java)){ }
9292

93-
val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get())
9493
kotlin {
95-
ktfmt(ktfmtVersion)
96-
target("src/**/*.kts", "src/**/*.kt")
94+
ktfmt(libs.versions.ktfmt.get())
95+
target("src/**/*.kt")
96+
targetExclude("**/build/**", "**/generated/**")
9797
trimTrailingWhitespace()
98-
suppressLintsFor { step = "ktfmt" }
99-
// licenseHeader(rootProject.file("gradle/license-header.txt"))
98+
endWithNewline()
99+
// licenseHeaderFile(rootProject.file("gradle/license-header.txt"))
100+
// suppressLintsFor {
101+
// step = "ktfmt"
102+
// shortCode = "ktfmt"
103+
// }
100104
}
101105

102106
kotlinGradle {
103-
ktfmt(ktfmtVersion)
104-
target("**/*.gradle.kts")
107+
ktfmt(libs.versions.ktfmt.get())
108+
target("**/*.kts", "*.kts")
105109
targetExclude("**/build/**")
106110
trimTrailingWhitespace()
111+
endWithNewline()
107112
}
108113

109114
format("misc") {
110-
target("**/*.md", "**/.kte")
115+
target("*.md", "*.kte")
111116
targetExclude("**/build/**")
112117
trimTrailingWhitespace()
113118
leadingTabsToSpaces(2)
119+
endWithNewline()
114120
}
115121
}
116122

0 commit comments

Comments
 (0)