Skip to content

Commit 4afb922

Browse files
committed
Rename Gradle plugin tasks from palantir to open
1 parent b59c522 commit 4afb922

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

‎gradle-open-java-format/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,28 @@ gradlePlugin {
4444
website = 'https://github.com/openjavaformat/open-java-format'
4545
vcsUrl = 'https://github.com/openjavaformat/open-java-format'
4646
plugins {
47-
palantirJavaFormat {
47+
openJavaFormat {
4848
id = 'dev.openjavaformat.java-format'
4949
implementationClass = 'com.palantir.javaformat.gradle.PalantirJavaFormatPlugin'
5050
description = 'A modern, lambda-friendly, 120 character Java formatter. Applies all other open-java-format plugins.'
5151
displayName = 'Open Java Format'
5252
tags.set(['java', 'style'])
5353
}
54-
palantirJavaFormatIdea {
54+
openJavaFormatIdea {
5555
id = 'dev.openjavaformat.java-format-idea'
5656
implementationClass = 'com.palantir.javaformat.gradle.PalantirJavaFormatIdeaPlugin'
5757
description = 'Plugin to configure the open-java-format IDEA plugin based on an optional implementation version of the formatter.'
5858
displayName = 'Open Java Format Idea'
5959
tags.set(['java', 'style'])
6060
}
61-
palantirJavaFormatSpotless {
61+
openJavaFormatSpotless {
6262
id = 'dev.openjavaformat.java-format-spotless'
6363
implementationClass = 'com.palantir.javaformat.gradle.PalantirJavaFormatSpotlessPlugin'
6464
description = 'If spotless is applied, configures a java step that formats using open-java-format.'
6565
displayName = 'Open Java Format Spotless'
6666
tags.set(['java', 'style'])
6767
}
68-
palantirJavaFormatProvider {
68+
openJavaFormatProvider {
6969
id = 'dev.openjavaformat.java-format-provider'
7070
implementationClass = 'com.palantir.javaformat.gradle.PalantirJavaFormatProviderPlugin'
7171
description = 'Exposes a configuration containing the open-java-format jars'

‎gradle-open-java-format/src/main/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public void apply(Project rootProject) {
5151

5252
rootProject.getPlugins().apply(PalantirJavaFormatProviderPlugin.class);
5353
rootProject.getPluginManager().withPlugin("idea", ideaPlugin -> {
54-
TaskProvider<UpdatePalantirJavaFormatIdeaXmlFile> updatePalantirJavaFormatXml = rootProject
54+
TaskProvider<UpdatePalantirJavaFormatIdeaXmlFile> updateOpenJavaFormatXml = rootProject
5555
.getTasks()
56-
.register("updatePalantirJavaFormatXml", UpdatePalantirJavaFormatIdeaXmlFile.class, task -> {
56+
.register("updateOpenJavaFormatXml", UpdatePalantirJavaFormatIdeaXmlFile.class, task -> {
5757
task.getXmlOutputFile().set(rootProject.file(".idea/open-java-format.xml"));
5858
task.getImplementationConfig()
5959
.from(rootProject
@@ -84,7 +84,7 @@ public void apply(Project rootProject) {
8484

8585
// Add the task to the Gradle start parameters so it executes automatically.
8686
StartParameter startParameter = rootProject.getGradle().getStartParameter();
87-
List<String> updateTasks = Stream.of(updatePalantirJavaFormatXml, updateWorkspaceXml)
87+
List<String> updateTasks = Stream.of(updateOpenJavaFormatXml, updateWorkspaceXml)
8888
.map(taskProvider -> String.format(":%s", taskProvider.getName()))
8989
.toList();
9090
List<String> taskNames = ImmutableList.<String>builder()

‎gradle-open-java-format/src/test/java/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPluginTest.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
import java.nio.file.Path;
2929
import java.util.List;
3030
import java.util.Optional;
31+
import org.gradle.testkit.runner.BuildResult;
32+
import org.gradle.testkit.runner.BuildTask;
33+
import org.gradle.testkit.runner.TaskOutcome;
3134
import org.junit.jupiter.api.io.TempDir;
3235
import org.junit.jupiter.params.ParameterizedTest;
3336
import org.junit.jupiter.params.provider.ValueSource;
@@ -59,7 +62,13 @@ void idea_configures_xml_files(String extraGradleProperties) throws IOException
5962
""",
6063
extraGradleProperties.isBlank() ? "" : NATIVE_CONFIG);
6164

62-
project.succeeds("idea");
65+
BuildResult result = project.succeeds("idea");
66+
67+
// Not requested on the command line: the plugin appends it to the tasks of every build.
68+
assertThat(result.task(":updateOpenJavaFormatXml"))
69+
.isNotNull()
70+
.extracting(BuildTask::getOutcome)
71+
.isEqualTo(TaskOutcome.SUCCESS);
6372

6473
assertThat(project.file(".idea/open-java-format.xml")).exists();
6574

0 commit comments

Comments
 (0)