Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/linter_formatter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ jobs:
run: npm init -y
- name: Install deps
run: |
npm install --save-dev \
prettier@3.6.2 \
prettier-plugin-java@2.7.7 \
prettier-plugin-toml@2.0.6
npm install --save-dev prettier@3.7.3
- name: Run Prettier
run: npx prettier --config .prettierrc.yaml --write .
run: npx prettier --config .prettierrc.yaml --ignore-path .prettierignore --write .
- id: verify_format
name: Verify no changes after formatting
run: |
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.java
**/*.java
12 changes: 0 additions & 12 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
---
plugins:
- prettier-plugin-java
- prettier-plugin-toml

printWidth: 120
tabWidth: 2
useTabs: false
Expand All @@ -16,11 +12,3 @@ objectWrap: collapse
bracketSameLine: false
arrowParens: always
endOfLine: lf

overrides:
- files: ["*.java"]
options:
tabWidth: 4
- files: ["*.properties"]
options:
keySeparator: =
13 changes: 13 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
alias(libs.plugins.spring.boot) apply false
alias(libs.plugins.spring.dependency.management) apply false
alias(libs.plugins.graalvm.native) apply false
alias(libs.plugins.spotless)
}

group = "com.workastra"
Expand All @@ -22,6 +23,7 @@ allprojects {
subprojects {
apply(plugin = "java")
apply(plugin = "checkstyle")
apply(plugin = "com.diffplug.spotless")

checkstyle {
toolVersion = "12.1.2"
Expand All @@ -33,4 +35,15 @@ subprojects {
languageVersion.set(JavaLanguageVersion.of(25))
}
}

spotless {
java {
target("src/*/java/**/*.java")

prettier(mapOf(
"prettier" to "3.7.3",
"prettier-plugin-java" to "2.7.7"
)).configFile(file("${rootDir}/java.prettierrc.yaml"))
}
}
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ spring-boot-bom = { module = "org.springframework.boot:spring-boot-dependencies"
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
graalvm-native = { id = "org.graalvm.buildtools.native", version = "0.11.3" }
spotless = { id = "com.diffplug.spotless", version = "8.1.0" }
17 changes: 17 additions & 0 deletions java.prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
plugins:
- prettier-plugin-java

printWidth: 120
tabWidth: 4
useTabs: false
semi: true
singleQuote: false
quoteProps: as-needed
jsxSingleQuote: false
trailingComma: all
bracketSpacing: true
objectWrap: collapse
bracketSameLine: false
arrowParens: always
endOfLine: lf
Loading