From 485547c6c286855fe1e6b9c4c1e139b89ced0db1 Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Sat, 2 Aug 2025 13:31:45 +0200 Subject: [PATCH] rm spotlessGradle --- app/common/build.gradle | 25 ------------------------- app/core/build.gradle | 26 -------------------------- app/proprietary/build.gradle | 25 ------------------------- build.gradle | 16 +--------------- 4 files changed, 1 insertion(+), 91 deletions(-) diff --git a/app/common/build.gradle b/app/common/build.gradle index 4cb30bbc8..f2b54bdf3 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -2,31 +2,6 @@ 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() - } - yaml { - target '**/*.yml', '**/*.yaml' - trimTrailingWhitespace() - leadingTabsToSpaces() - endWithNewline() - } - format 'gradle', { - target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle' - 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 2346bf13f..9d36bf327 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -12,32 +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() - } - yaml { - target '**/*.yml', '**/*.yaml' - trimTrailingWhitespace() - leadingTabsToSpaces() - endWithNewline() - } - format 'gradle', { - target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle' - 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 cdce686ac..4de351862 100644 --- a/app/proprietary/build.gradle +++ b/app/proprietary/build.gradle @@ -4,31 +4,6 @@ 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() - } - yaml { - target '**/*.yml', '**/*.yaml' - trimTrailingWhitespace() - leadingTabsToSpaces() - endWithNewline() - } - format 'gradle', { - target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle' - trimTrailingWhitespace() - leadingTabsToSpaces() - endWithNewline() - } -} dependencies { implementation project(':common') diff --git a/build.gradle b/build.gradle index e84f228a7..e2e8194aa 100644 --- a/build.gradle +++ b/build.gradle @@ -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) @@ -633,10 +626,3 @@ tasks.named('build') { println "Delegating to :stirling-pdf:bootJar" } } - -tasks.named('spotlessGradle') { - mustRunAfter ':common:processTestResources' - mustRunAfter ':common:spotlessGradle' - mustRunAfter ':stirling-pdf:spotlessGradle' - mustRunAfter ':proprietary:spotlessGradle' -}