From f8193f0e1d55100c32ecf54de7568a5d961ef060 Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Sat, 2 Aug 2025 13:07:10 +0200 Subject: [PATCH] back --- app/common/build.gradle | 23 +++++++++++++++++++++++ app/core/build.gradle | 23 +++++++++++++++++++++++ app/proprietary/build.gradle | 23 +++++++++++++++++++++++ build.gradle | 1 - 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/app/common/build.gradle b/app/common/build.gradle index e0fd6adb6..4cb30bbc8 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -3,6 +3,29 @@ 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' diff --git a/app/core/build.gradle b/app/core/build.gradle index 9817e1300..2346bf13f 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -13,6 +13,29 @@ 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 { diff --git a/app/proprietary/build.gradle b/app/proprietary/build.gradle index a1f869afe..cdce686ac 100644 --- a/app/proprietary/build.gradle +++ b/app/proprietary/build.gradle @@ -5,6 +5,29 @@ 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 5b32cf76a..e2e8194aa 100644 --- a/build.gradle +++ b/build.gradle @@ -538,7 +538,6 @@ spotless { trimTrailingWhitespace() leadingTabsToSpaces() endWithNewline() - // formatAnnotations() } yaml { target '**/*.yml', '**/*.yaml'