mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-08-02 13:48:15 +02:00
style(spotless): centralize and expand formatting config in root build.gradle
This commit is contained in:
parent
a5d219ed05
commit
1a700a800b
@ -2,19 +2,7 @@
|
|||||||
bootRun {
|
bootRun {
|
||||||
enabled = false
|
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 {
|
dependencies {
|
||||||
api 'org.springframework.boot:spring-boot-starter-web'
|
api 'org.springframework.boot:spring-boot-starter-web'
|
||||||
api 'org.springframework.boot:spring-boot-starter-aop'
|
api 'org.springframework.boot:spring-boot-starter-aop'
|
||||||
|
@ -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 {
|
dependencies {
|
||||||
if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
|
if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
|
||||||
|| (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
|
|| (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
|
||||||
|
@ -4,19 +4,7 @@ repositories {
|
|||||||
bootRun {
|
bootRun {
|
||||||
enabled = false
|
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 {
|
dependencies {
|
||||||
implementation project(':common')
|
implementation project(':common')
|
||||||
|
|
||||||
|
24
build.gradle
24
build.gradle
@ -29,7 +29,7 @@ ext {
|
|||||||
springSecuritySamlVersion = "6.5.2"
|
springSecuritySamlVersion = "6.5.2"
|
||||||
openSamlVersion = "4.3.2"
|
openSamlVersion = "4.3.2"
|
||||||
commonmarkVersion = "0.25.0"
|
commonmarkVersion = "0.25.0"
|
||||||
googleJavaFormatVersion = "1.27.0"
|
googleJavaFormatVersion = "1.28.0"
|
||||||
tempJrePath = null
|
tempJrePath = null
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -529,14 +529,7 @@ launch4j {
|
|||||||
|
|
||||||
spotless {
|
spotless {
|
||||||
java {
|
java {
|
||||||
target sourceSets.main.allJava
|
target '*.java', 'app/**/*.java'
|
||||||
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)
|
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
|
||||||
|
|
||||||
@ -545,6 +538,19 @@ spotless {
|
|||||||
trimTrailingWhitespace()
|
trimTrailingWhitespace()
|
||||||
leadingTabsToSpaces()
|
leadingTabsToSpaces()
|
||||||
endWithNewline()
|
endWithNewline()
|
||||||
|
// formatAnnotations()
|
||||||
|
}
|
||||||
|
yaml {
|
||||||
|
target '**/*.yml', '**/*.yaml'
|
||||||
|
trimTrailingWhitespace()
|
||||||
|
leadingTabsToSpaces()
|
||||||
|
endWithNewline()
|
||||||
|
}
|
||||||
|
format 'gradle', {
|
||||||
|
target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle'
|
||||||
|
trimTrailingWhitespace()
|
||||||
|
leadingTabsToSpaces()
|
||||||
|
endWithNewline()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user