From 1a700a800b0f1617834da7d9affc1cb92d26d3cc Mon Sep 17 00:00:00 2001
From: Ludy87 <Ludy87@users.noreply.github.com>
Date: Sat, 2 Aug 2025 12:21:32 +0200
Subject: [PATCH] style(spotless): centralize and expand formatting config in
 root `build.gradle`

---
 app/common/build.gradle      | 12 ------------
 app/core/build.gradle        | 14 --------------
 app/proprietary/build.gradle | 12 ------------
 build.gradle                 | 30 ++++++++++++++++++------------
 4 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/app/common/build.gradle b/app/common/build.gradle
index 515a52a5c..3fcb16466 100644
--- a/app/common/build.gradle
+++ b/app/common/build.gradle
@@ -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'
diff --git a/app/core/build.gradle b/app/core/build.gradle
index 46aad111c..9d36bf327 100644
--- a/app/core/build.gradle
+++ b/app/core/build.gradle
@@ -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')
diff --git a/app/proprietary/build.gradle b/app/proprietary/build.gradle
index 467d8a138..4c4b2f26c 100644
--- a/app/proprietary/build.gradle
+++ b/app/proprietary/build.gradle
@@ -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')
 
diff --git a/build.gradle b/build.gradle
index ceb786ff0..5b32cf76a 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'
@@ -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()
     }
 }