Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson 2022-03-02 20:30:30 +00:00
commit bfe9dede5b
1 changed files with 8 additions and 0 deletions

View File

@ -161,6 +161,14 @@ def syncJavaTemplates = tasks.register("syncJavaTemplates", Sync) {
inputs.properties(properties)
}
tasks.named("checkFormatMain") {
def generatedSources = fileTree("build/generated-sources/main")
// Exclude source generated from the templates as expand(properties) changes line endings on Windows
exclude { candidate -> generatedSources.contains(candidate.file) }
// Add the templates to check that the input is correctly formatted
source(fileTree("src/main/javaTemplates"))
}
plugins.withType(EclipsePlugin) {
eclipse {
synchronizationTasks syncJavaTemplates