Skip to content

Commit 098cdb7

Browse files
committed
Consistently add license header to all java source files
* Add line break after license header to all files, including Kotlin * Add license header to `package-info.java` files (cherry picked from commit e373917)
1 parent 4133d24 commit 098cdb7

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

gradle/config/spotless/eclipse-public-license-2.0.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
*
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
10+

gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ abstract class GenerateJreRelatedSourceCode : DefaultTask() {
6060
val params = mapOf(
6161
"jres" to jres,
6262
"jresSortedByStringValue" to jres.sortedBy { it.version.toString() },
63-
"licenseHeader" to licenseHeaderFile.asFile.get().readText()
63+
"licenseHeader" to licenseHeaderFile.asFile.get().readText().trimEnd() + "\n",
6464
)
6565
templates.forEach {
6666
val targetFile = mainTargetDir.toPath().resolve(it.resolveSibling(it.nameWithoutExtension).path)

gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ spotless {
2929
val javaFormatterConfigFile = configDir.file("junit-eclipse-formatter-settings.xml")
3030

3131
java {
32+
targetExclude("**/module-info.java", "**/package-info.java")
3233
licenseHeaderFile(license.headerFile, "(package|import) ")
3334
importOrderFile(importOrderConfigFile)
3435
val fullVersion = requiredVersionFromLibs("eclipse")
@@ -39,13 +40,14 @@ spotless {
3940
removeUnusedImports()
4041
}
4142

42-
format("moduleDescriptor") {
43+
format("moduleAndPackageInfo") {
4344
target(fileTree(layout.projectDirectory.dir("src/module")) {
44-
include("**/module-info.java")
45+
include("**/module-info.java", "**/package-info.java")
4546
})
46-
licenseHeaderFile(license.headerFile, "^$")
47+
licenseHeaderFile(license.headerFile, "((/(//|\\*\\*))|((open )?module )|package|@.+)")
4748
trimTrailingWhitespace()
4849
endWithNewline()
50+
leadingSpacesToTabs()
4951
}
5052
}
5153

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ spotless {
1919
java {
2020
target(files(project.java.sourceSets.map { it.allJava }), "projects/**/*.java")
2121
}
22+
format("moduleAndPackageInfo") {
23+
target("projects/**/module-info.java", "projects/**/package-info.java")
24+
}
2225
kotlin {
2326
target("projects/**/*.kt")
2427
}

0 commit comments

Comments
 (0)