Skip to content

Commit c85e6c3

Browse files
author
TheSnoozer
committed
move the names of things closer to the actual class
1 parent e12f6b2 commit c85e6c3

6 files changed

Lines changed: 47 additions & 18 deletions

File tree

src/main/java/io/github/git/commit/id/gradle/plugin/GitCommitIdPlugin.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.gradle.api.Plugin;
2121
import org.gradle.api.Project;
2222
import org.gradle.api.plugins.ExtensionAware;
23-
import pl.project13.core.CommitIdPropertiesOutputFormat;
2423

2524
/**
2625
* The GitCommitIdPlugin or also known as git-commit-id-gradle-plugin is a plugin
@@ -64,21 +63,21 @@
6463
* to {@link GitCommitIdPluginGenerationTask}.
6564
*/
6665
public class GitCommitIdPlugin implements Plugin<Project> {
67-
public static final String GIT_COMMIT_ID_EXTENSION_NAME = "gitCommitId";
68-
public static final String GIT_COMMIT_ID_TASK_NAME = "gitCommitIdGenerationTask";
69-
7066
/**
7167
* Apply this plugin to the given target project.
7268
*
7369
* @param project The target project
7470
*/
7571
public void apply(Project project) {
7672
var extension = project.getExtensions().create(
77-
GIT_COMMIT_ID_EXTENSION_NAME, GitCommitIdPluginExtension.class);
73+
GitCommitIdPluginExtension.NAME,
74+
GitCommitIdPluginExtension.class);
7875
((ExtensionAware) extension).getExtensions().create(
79-
"outputSettings", GitCommitIdPluginOutputSettingsExtension.class);
76+
GitCommitIdPluginOutputSettingsExtension.NAME,
77+
GitCommitIdPluginOutputSettingsExtension.class);
8078
var task = project.getTasks().create(
81-
GIT_COMMIT_ID_TASK_NAME, GitCommitIdPluginGenerationTask.class);
79+
GitCommitIdPluginGenerationTask.NAME,
80+
GitCommitIdPluginGenerationTask.class);
8281
task.onlyIf(ignore -> extension.getSkip().get() == false);
8382
}
8483
}

src/main/java/io/github/git/commit/id/gradle/plugin/GitCommitIdPluginExtension.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import javax.inject.Inject;
2323
import org.gradle.api.file.DirectoryProperty;
2424
import org.gradle.api.file.ProjectLayout;
25-
import org.gradle.api.file.RegularFileProperty;
2625
import org.gradle.api.provider.ListProperty;
2726
import org.gradle.api.provider.Property;
28-
import pl.project13.core.CommitIdPropertiesOutputFormat;
2927
import pl.project13.core.git.GitDescribeConfig;
3028

3129
/**
@@ -52,6 +50,17 @@
5250
* </pre>
5351
*/
5452
public abstract class GitCommitIdPluginExtension {
53+
/**
54+
* Name of the extension how it's made available to the end-user as
55+
* DSL like configuration in the {@code build.gradle}:
56+
* <pre>
57+
* gitCommitId {
58+
* skip.set(false)
59+
* }
60+
* </pre>.
61+
*/
62+
public static final String NAME = "gitCommitId";
63+
5564
/**
5665
* Configuration option to enable or disable more verbose information during the
5766
* execution of the plugin.

src/main/java/io/github/git/commit/id/gradle/plugin/GitCommitIdPluginGenerationTask.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
*/
5454
@CacheableTask
5555
public class GitCommitIdPluginGenerationTask extends DefaultTask {
56+
/**
57+
* Name of the task how it's made available to the end-user's
58+
* task execution graph.
59+
*/
60+
public static final String NAME = "gitCommitIdGenerationTask";
61+
5662
/**
5763
* The {@link GitCommitIdPluginExtension} that serves as configuration of the plugin / task.
5864
*

src/main/java/io/github/git/commit/id/gradle/plugin/GitCommitIdPluginOutputSettingsExtension.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@
4343
* {@link GitCommitIdPluginGenerationTask}.
4444
*/
4545
public abstract class GitCommitIdPluginOutputSettingsExtension {
46+
/**
47+
* Name of the extension how it's made available to the end-user as
48+
* DSL like configuration in the {@code build.gradle}:
49+
* <pre>
50+
* gitCommitId {
51+
* outputSettings {
52+
* shouldGenerateOutputFile.set(true)
53+
* }
54+
* }
55+
* </pre>
56+
* As may notice this extension is made available as "nested" extension
57+
* of the {@link GitCommitIdPluginExtension}.
58+
*/
59+
public static final String NAME = "outputSettings";
4660

4761
/**
4862
* Configuration option to enable or disable the generation of an output file.
@@ -85,7 +99,8 @@ public abstract class GitCommitIdPluginOutputSettingsExtension {
8599
* If you so desire and wish for unicode escaping (e.g. \\u6E2C\\u8A66\\u4E2D\\u6587) you
86100
* can set this to {@code true}.
87101
*
88-
* <p>Only applies if the {@link #getOutputFormat()} is instructed to generate a "properties" file</p>
102+
* <p>Only applies if the {@link #getOutputFormat()} is instructed
103+
* to generate a "properties" file</p>
89104
*/
90105
public abstract Property<Boolean> getShouldEscapedUnicodeForPropertiesOutput();
91106

src/test/groovy/io.github.git.commit.id.gradle.plugin/GradleCompabilityTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ class GradleCompabilityTest extends AbstractGradleTest {
2727
def result = runner.build()
2828
Assertions.assertEquals(
2929
TaskOutcome.SUCCESS,
30-
result.task(":${GitCommitIdPlugin.GIT_COMMIT_ID_TASK_NAME}")?.outcome,
30+
result.task(":${GitCommitIdPluginGenerationTask.NAME}")?.outcome,
3131
result.output
3232
)
3333

3434
and: "running it again should yield an up-to-date"
3535
result = runner.build()
3636
Assertions.assertEquals(
3737
TaskOutcome.UP_TO_DATE,
38-
result.task(":${GitCommitIdPlugin.GIT_COMMIT_ID_TASK_NAME}")?.outcome,
38+
result.task(":${GitCommitIdPluginGenerationTask.NAME}")?.outcome,
3939
result.output
4040
)
4141
}
4242

4343
private static Stream<Arguments> getGradleTestParams() {
4444
return Stream.of(
45-
Arguments.of("8.1.1", Arrays.asList("${GitCommitIdPlugin.GIT_COMMIT_ID_TASK_NAME}")),
45+
Arguments.of("8.1.1", Arrays.asList("${GitCommitIdPluginGenerationTask.NAME}")),
4646
/*
4747
Arguments.of("8.1"),
4848
Arguments.of("8.0.2"),

src/test/groovy/io.github.git.commit.id.gradle.plugin/GradleIntegrationTest.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ class GradleIntegrationTest extends AbstractGradleTest {
1212
private GradleRunner createRunner(projectDir) {
1313
GradleRunner.create()
1414
.withPluginClasspath()
15-
.withArguments(":${GitCommitIdPlugin.GIT_COMMIT_ID_TASK_NAME}", "--stacktrace", "--debug")
15+
.withArguments(":${GitCommitIdPluginGenerationTask.NAME}", "--stacktrace", "--debug")
1616
.withProjectDir(projectDir)
1717
}
1818

1919
private void assertTaskOutcome(BuildResult result, TaskOutcome expectedTaskOutcome) {
2020
Assertions.assertEquals(
2121
expectedTaskOutcome,
22-
result.task(":${GitCommitIdPlugin.GIT_COMMIT_ID_TASK_NAME}")?.outcome,
22+
result.task(":${GitCommitIdPluginGenerationTask.NAME}")?.outcome,
2323
result.output
2424
)
2525
}
@@ -33,7 +33,7 @@ class GradleIntegrationTest extends AbstractGradleTest {
3333
new File(projectDir, "build.gradle").withWriterAppend("UTF-8") {
3434
it.write(
3535
"""
36-
${GitCommitIdPlugin.GIT_COMMIT_ID_EXTENSION_NAME} {
36+
${GitCommitIdPluginExtension.NAME} {
3737
skip.set($shouldSkip)
3838
}
3939
""".stripIndent()
@@ -89,9 +89,9 @@ class GradleIntegrationTest extends AbstractGradleTest {
8989
new File(projectDir, "build.gradle").withWriterAppend("UTF-8") {
9090
it.write(
9191
"""
92-
${GitCommitIdPlugin.GIT_COMMIT_ID_EXTENSION_NAME} {
92+
${GitCommitIdPluginExtension.NAME} {
9393
outputSettings {
94-
generateGitPropertiesFile.set(true)
94+
shouldGenerateOutputFile.set(true)
9595
}
9696
}
9797
""".stripIndent()

0 commit comments

Comments
 (0)