style(spotless): centralize and expand formatting config in root build.gradle

This commit is contained in:
Ludy87 2025-08-02 12:21:32 +02:00
parent a5d219ed05
commit 1a700a800b
No known key found for this signature in database
GPG Key ID: 92696155E0220F94
4 changed files with 18 additions and 50 deletions

View File

@ -2,19 +2,7 @@
bootRun {
enabled = false
}
spotless {
java {
target sourceSets.main.allJava
target sourceSets.test.allJava
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
toggleOffOn()
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
}
}
dependencies {
api 'org.springframework.boot:spring-boot-starter-web'
api 'org.springframework.boot:spring-boot-starter-aop'

View File

@ -12,20 +12,6 @@ configurations {
}
}
spotless {
java {
target sourceSets.main.allJava
target sourceSets.test.allJava
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
toggleOffOn()
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
}
}
dependencies {
if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
|| (project.hasProperty('STIRLING_PDF_DESKTOP_UI')

View File

@ -4,19 +4,7 @@ repositories {
bootRun {
enabled = false
}
spotless {
java {
target sourceSets.main.allJava
target sourceSets.test.allJava
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
toggleOffOn()
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
}
}
dependencies {
implementation project(':common')

View File

@ -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'
@ -529,14 +529,7 @@ 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
target '*.java', 'app/**/*.java'
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
@ -545,6 +538,19 @@ spotless {
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
// formatAnnotations()
}
yaml {
target '**/*.yml', '**/*.yaml'
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
}
format 'gradle', {
target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle'
trimTrailingWhitespace()
leadingTabsToSpaces()
endWithNewline()
}
}