Skip to content

Commit 01aff7f

Browse files
author
Vincent Potucek
committed
centralize spotless config
Signed-off-by: Vincent Potucek <[email protected]>
1 parent 27f4e5c commit 01aff7f

File tree

3 files changed

+18
-28
lines changed

3 files changed

+18
-28
lines changed

build.gradle

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,14 @@ equoIde {
44
welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
55
gradleBuildship().autoImport('.')
66
}
7-
87
repositories {
98
mavenCentral()
109
}
11-
12-
apply from: rootProject.file('gradle/java-publish.gradle')
13-
apply from: rootProject.file('gradle/changelog.gradle')
1410
allprojects {
1511
apply from: rootProject.file('gradle/error-prone.gradle')
16-
apply from: rootProject.file('gradle/rewrite.gradle')
1712
apply from: rootProject.file('gradle/spotless.gradle')
1813
}
14+
apply from: rootProject.file('gradle/changelog.gradle')
15+
apply from: rootProject.file('gradle/java-publish.gradle')
16+
apply from: rootProject.file('gradle/rewrite.gradle')
1917
apply from: rootProject.file('gradle/spotless-freshmark.gradle')
20-
21-
spotless {
22-
groovyGradle {
23-
target '*.gradle', 'gradle/*.gradle'
24-
}
25-
format 'dotfiles', {
26-
target '.gitignore', '.gitattributes', '.editorconfig'
27-
leadingTabsToSpaces(2)
28-
trimTrailingWhitespace()
29-
endWithNewline()
30-
}
31-
}
32-
33-
dependencies {
34-
rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0'))
35-
rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.19.0')
36-
rewrite('org.openrewrite.recipe:rewrite-java-security:3.19.2')
37-
rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.0')
38-
rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.19.0')
39-
rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1')
40-
}

gradle/rewrite.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'org.openrewrite.rewrite'
2-
32
rewrite {
43
activeRecipe('com.diffplug.spotless.openrewrite.SanityCheck')
54
exclusions.addAll(
@@ -21,3 +20,11 @@ rewrite {
2120
exportDatatables = true
2221
failOnDryRunResults = true
2322
}
23+
dependencies {
24+
rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0'))
25+
rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.20.0')
26+
rewrite('org.openrewrite.recipe:rewrite-java-security:3.20.0')
27+
rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.1')
28+
rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.20.0')
29+
rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1')
30+
}

gradle/spotless.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ spotless {
1616
}
1717
}
1818
groovyGradle {
19-
target '*.gradle'
19+
target '*.gradle', 'gradle/*.gradle'
2020
greclipse().configFile rootProject.files('gradle/spotless.eclipseformat.xml', 'gradle/spotless.groovyformat.prefs')
2121
}
22+
format 'dotfiles', {
23+
target '.gitignore', '.gitattributes', '.editorconfig'
24+
leadingTabsToSpaces(2)
25+
trimTrailingWhitespace()
26+
endWithNewline()
27+
}
2228
}

0 commit comments

Comments
 (0)