Skip to content

Commit e65bd42

Browse files
committed
Added JSON / XML formatter, updated graalvm
1 parent 3e8edd5 commit e65bd42

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group 'com.formkiq.gradle'
8-
version '1.0.0'
8+
version '1.0.1'
99

1010
allprojects {
1111
apply plugin: 'com.diffplug.spotless'
@@ -29,6 +29,11 @@ tasks.named('test', Test) {
2929
}
3030

3131
spotless {
32+
spotless {
33+
java {
34+
eclipse().sortMembersEnabled(true).configFile rootProject.file("spotless.eclipseformat.xml")
35+
}
36+
}
3237
groovyGradle {
3338
target '**/*.gradle'
3439
greclipse()
@@ -67,4 +72,5 @@ publishing {
6772
}
6873
}
6974

75+
spotlessJavaCheck.dependsOn 'spotlessJavaApply'
7076
check.dependsOn(tasks.publishToMavenLocal)

src/main/java/com/formkiq/gradle/JavaBasePlugin.java

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.formkiq.gradle;
22

33
import com.diffplug.gradle.spotless.SpotlessExtension;
4+
import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
45
import com.github.spotbugs.snom.SpotBugsExtension;
56
import org.gradle.api.Plugin;
67
import org.gradle.api.Project;
@@ -20,6 +21,8 @@ public class JavaBasePlugin implements Plugin<Project> {
2021

2122
/** Checkstyle Version. */
2223
private static final String CHECKSTYLE_TOOL_VERSION = "10.12.4";
24+
/** Java version. */
25+
private static final int JAVA_VERSION = 17;
2326

2427
@Override
2528
public void apply(Project root) {
@@ -39,16 +42,18 @@ public void apply(Project root) {
3942
// Repositories
4043
p.getRepositories().mavenLocal();
4144
p.getRepositories().mavenCentral();
42-
p.getRepositories().maven(repo -> repo.setUrl("https://central.sonatype.com/repository/maven-snapshots/"));
45+
p.getRepositories()
46+
.maven(repo -> repo.setUrl("https://central.sonatype.com/repository/maven-snapshots/"));
4347

4448
// Java toolchain 17
4549
JavaPluginExtension java = p.getExtensions().getByType(JavaPluginExtension.class);
46-
java.getToolchain().getLanguageVersion().set(JavaLanguageVersion.of(17));
50+
java.getToolchain().getLanguageVersion().set(JavaLanguageVersion.of(JAVA_VERSION));
4751

4852
// Spotless
4953
p.getExtensions().configure(SpotlessExtension.class, (SpotlessExtension s) -> {
5054
s.java(j -> {
51-
j.eclipse().sortMembersEnabled(true).configFile(p.getRootProject().file("spotless.eclipseformat.xml"));
55+
j.eclipse().sortMembersEnabled(true)
56+
.configFile(p.getRootProject().file("spotless.eclipseformat.xml"));
5257
j.removeUnusedImports();
5358
j.removeWildcardImports();
5459
j.licenseHeaderFile(p.getRootProject().file("LICENSE"));
@@ -60,12 +65,22 @@ public void apply(Project root) {
6065
g.trimTrailingWhitespace();
6166
g.endWithNewline();
6267
});
68+
s.json(j -> {
69+
j.target("*.json", "**/*.json");
70+
j.prettier();
71+
});
72+
73+
s.format("xml", f -> {
74+
f.target("*.xml", "**/*.xml");
75+
f.eclipseWtp(EclipseWtpFormatterStep.XML);
76+
f.trimTrailingWhitespace();
77+
f.endWithNewline();
78+
});
6379
});
6480

6581
// SpotBugs
66-
p.getExtensions().configure(SpotBugsExtension.class, sb ->
67-
sb.getExcludeFilter().set(p.file(p.getRootDir() + "/config/gradle/spotbugs-exclude.xml"))
68-
);
82+
p.getExtensions().configure(SpotBugsExtension.class, sb -> sb.getExcludeFilter()
83+
.set(p.file(p.getRootDir() + "/config/gradle/spotbugs-exclude.xml")));
6984

7085
p.getTasks().withType(com.github.spotbugs.snom.SpotBugsTask.class).configureEach(t -> {
7186
if (t.getReports().findByName("html") == null) {
@@ -90,9 +105,8 @@ public void apply(Project root) {
90105
});
91106

92107
// Compiler flags
93-
p.getTasks().withType(JavaCompile.class).configureEach(jc ->
94-
jc.getOptions().getCompilerArgs().add("-Xlint:deprecation")
95-
);
108+
p.getTasks().withType(JavaCompile.class)
109+
.configureEach(jc -> jc.getOptions().getCompilerArgs().add("-Xlint:deprecation"));
96110

97111
// Tests
98112
p.getTasks().withType(Test.class).configureEach(t -> {

0 commit comments

Comments
 (0)