Skip to content

Commit 58da780

Browse files
committed
feat: improve version output
1 parent cd2ea01 commit 58da780

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

app/src/main/java/com/diffplug/spotless/cli/version/SpotlessCLIVersionProvider.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ public String[] getVersion() throws Exception {
2727
Properties properties = new Properties();
2828
properties.load(getClass().getResourceAsStream("/application.properties"));
2929
String version = properties.getProperty("cli.version");
30-
return new String[] {"Spotless CLI version " + version};
30+
String libVersion = properties.getProperty("lib.version");
31+
String libExtraVersion = properties.getProperty("lib.extra.version");
32+
String line = "-".repeat(50);
33+
return """
34+
%1$s
35+
🧼 Spotless CLI %2$s
36+
%1$s
37+
38+
spotless-lib: %3$s
39+
spotless-lib-extra: %4$s
40+
"""
41+
.formatted(line, version, libVersion, libExtraVersion)
42+
.split("\n");
3143
}
3244
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
cli.version[email protected]@
2+
lib.version[email protected]@
3+
lib.extra.version[email protected]@

app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIHelpAndVersionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ void testHelp() {
3030
@Test
3131
void testVersion() {
3232
SpotlessCLIRunner.Result result = cliRunner().withOption("--version").run();
33-
assertThat(result.stdOut()).contains("Spotless CLI version");
33+
assertThat(result.stdOut()).containsPattern("Spotless CLI \\d+\\.\\d+\\.\\d+.*");
3434
}
3535
}

build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ compileJava {
2121
tasks.withType(ProcessResources)
2222
.configureEach(new ApplicationPropertiesProcessResourcesAction(
2323
[
24-
"cli.version": rootProject.version
24+
"cli.version": rootProject.version,
25+
"lib.version": libs.versions.spotless.lib.get(),
26+
"lib.extra.version": libs.versions.spotless.lib.get(),
2527
]
2628
))
2729

0 commit comments

Comments
 (0)