diff --git a/app/common/build.gradle b/app/common/build.gradle index 515a52a5c..7b210406e 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -4,8 +4,7 @@ bootRun { } spotless { java { - target sourceSets.main.allJava - target sourceSets.test.allJava + target 'src/**/java/**/*.java' googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") @@ -14,6 +13,18 @@ spotless { leadingTabsToSpaces() endWithNewline() } + yaml { + target '**/*.yml', '**/*.yaml' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } + format 'gradle', { + target '**/gradle/*.gradle', '**/*.gradle' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } } dependencies { api 'org.springframework.boot:spring-boot-starter-web' diff --git a/app/core/build.gradle b/app/core/build.gradle index 46aad111c..037a89497 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -14,8 +14,7 @@ configurations { spotless { java { - target sourceSets.main.allJava - target sourceSets.test.allJava + target 'src/**/java/**/*.java' googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") @@ -24,6 +23,18 @@ spotless { leadingTabsToSpaces() endWithNewline() } + yaml { + target '**/*.yml', '**/*.yaml' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } + format 'gradle', { + target '**/gradle/*.gradle', '**/*.gradle' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } } dependencies { diff --git a/app/proprietary/build.gradle b/app/proprietary/build.gradle index 467d8a138..80b61438a 100644 --- a/app/proprietary/build.gradle +++ b/app/proprietary/build.gradle @@ -5,9 +5,8 @@ bootRun { enabled = false } spotless { - java { - target sourceSets.main.allJava - target sourceSets.test.allJava + java { + target 'src/**/java/**/*.java' googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") @@ -16,6 +15,18 @@ spotless { leadingTabsToSpaces() endWithNewline() } + yaml { + target '**/*.yml', '**/*.yaml' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } + format 'gradle', { + target '**/gradle/*.gradle', '**/*.gradle' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } } dependencies { implementation project(':common') diff --git a/build.gradle b/build.gradle index ceb786ff0..554d92689 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ ext { springSecuritySamlVersion = "6.5.2" openSamlVersion = "4.3.2" commonmarkVersion = "0.25.0" - googleJavaFormatVersion = "1.27.0" + googleJavaFormatVersion = "1.28.0" tempJrePath = null } @@ -158,9 +158,9 @@ subprojects { useJUnitPlatform() } - tasks.named("processResources") { - dependsOn(rootProject.tasks.writeVersion) - } + tasks.named("processResources") { + dependsOn(rootProject.tasks.writeVersion) + } if (name == 'stirling-pdf') { apply plugin: 'org.springdoc.openapi-gradle-plugin' @@ -528,20 +528,14 @@ launch4j { } spotless { - java { - target sourceSets.main.allJava - target sourceSets.test.allJava - target project(':common').sourceSets.main.allJava - target project(':common').sourceSets.test.allJava - target project(':proprietary').sourceSets.main.allJava - target project(':proprietary').sourceSets.test.allJava - target project(':stirling-pdf').sourceSets.main.allJava - target project(':stirling-pdf').sourceSets.test.allJava - - googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) - - importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") - toggleOffOn() + yaml { + target '*.yml', '*.yaml' + trimTrailingWhitespace() + leadingTabsToSpaces() + endWithNewline() + } + format 'gradle', { + target 'build.gradle', 'settings.gradle', 'gradle/*.gradle', 'gradle/**/*.gradle' trimTrailingWhitespace() leadingTabsToSpaces() endWithNewline()