Skip to content

Commit dd09dc4

Browse files
Tweak import ordering; exclude generated code for Spotless
1 parent ea7cddc commit dd09dc4

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/main/kotlin/com.opencastsoftware.gradle.java-conventions.gradle.kts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ version = "0.0.0-SNAPSHOT"
2525
gitVersioning.apply {
2626
refs {
2727
branch(".+") {
28-
describeTagPattern = "v(?<version>.*)"
28+
describeTagPattern = "v(?<version>.+)"
2929
version =
3030
"\${describe.tag.version:-0.0.0}-\${describe.distance}-\${commit.short}-SNAPSHOT"
3131
}
32-
tag("v(?<version>.*)") { version = "\${ref.version}" }
32+
tag("v(?<version>.+)") { version = "\${ref.version}" }
3333
}
3434
rev {
35-
describeTagPattern = "v(?<version>.*)"
35+
describeTagPattern = "v(?<version>.+)"
3636
version = "\${describe.tag.version:-0.0.0}-\${describe.distance}-\${commit.short}-SNAPSHOT"
3737
}
3838
}
@@ -42,6 +42,7 @@ spotless {
4242

4343
java {
4444
encoding("UTF-8")
45+
targetExclude("build/**")
4546
licenseHeader(
4647
"""
4748
/*
@@ -52,15 +53,15 @@ spotless {
5253
.trimIndent()
5354
)
5455
removeUnusedImports()
55-
importOrder("", "javax", "java", "\\#")
56+
importOrder("", "javax|java", "\\#") // IntelliJ import order
5657
indentWithSpaces()
5758
trimTrailingWhitespace()
5859
endWithNewline()
5960
}
6061

6162
kotlinGradle {
6263
encoding("UTF-8")
63-
target("**/*.gradle.kts")
64+
target("*.gradle.kts")
6465
ktfmt().kotlinlangStyle()
6566
indentWithSpaces()
6667
trimTrailingWhitespace()
@@ -80,7 +81,10 @@ mavenPublishing {
8081
}
8182
}
8283

83-
tasks.withType<JavaCompile> { options.encoding = "UTF-8" }
84+
tasks.withType<JavaCompile> {
85+
options.encoding = "UTF-8"
86+
options.compilerArgs.add("-Xlint")
87+
}
8488

8589
tasks.named<Test>("test") { useJUnitPlatform() }
8690

0 commit comments

Comments
 (0)