|
1 |
| -import com.diffplug.spotless.kotlin.KtfmtStep |
2 | 1 | import common.*
|
3 | 2 | import java.time.Year
|
4 | 3 | import org.hildan.github.changelog.plugin.GitHubChangelogExtension
|
@@ -83,34 +82,41 @@ dokka {
|
83 | 82 | }
|
84 | 83 |
|
85 | 84 | 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 | + } |
90 | 91 | }
|
91 |
| - // if(plugins.hasPlugin(JavaPlugin::class.java)){ } |
92 | 92 |
|
93 |
| - val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get()) |
94 | 93 | kotlin {
|
95 |
| - ktfmt(ktfmtVersion) |
96 |
| - target("src/**/*.kts", "src/**/*.kt") |
| 94 | + ktfmt(libs.versions.ktfmt.get()) |
| 95 | + target("src/**/*.kt") |
| 96 | + targetExclude("**/build/**", "**/generated/**") |
97 | 97 | 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 | + // } |
100 | 104 | }
|
101 | 105 |
|
102 | 106 | kotlinGradle {
|
103 |
| - ktfmt(ktfmtVersion) |
104 |
| - target("**/*.gradle.kts") |
| 107 | + ktfmt(libs.versions.ktfmt.get()) |
| 108 | + target("**/*.kts", "*.kts") |
105 | 109 | targetExclude("**/build/**")
|
106 | 110 | trimTrailingWhitespace()
|
| 111 | + endWithNewline() |
107 | 112 | }
|
108 | 113 |
|
109 | 114 | format("misc") {
|
110 |
| - target("**/*.md", "**/.kte") |
| 115 | + target("*.md", "*.kte") |
111 | 116 | targetExclude("**/build/**")
|
112 | 117 | trimTrailingWhitespace()
|
113 | 118 | leadingTabsToSpaces(2)
|
| 119 | + endWithNewline() |
114 | 120 | }
|
115 | 121 | }
|
116 | 122 |
|
|
0 commit comments