Skip to content

baseline-class-uniqueness is updated by ./gradlew --write-locks #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bulldozer-bot merged 2 commits into from
Jan 9, 2020
Merged

baseline-class-uniqueness is updated by ./gradlew --write-locks #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dab481c
baseline-class-uniqueness is updated by --write-locks
iamdanfox Jan 9, 2020
61ba7c4
Add generated changelog entries
iamdanfox Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-1153.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: Running `./gradlew --write-locks` will now update the baseline-class-uniqueness.lock
file.
links:
- https://github.com/palantir/gradle-baseline/pull/1153
20 changes: 17 additions & 3 deletions ...ine-java/src/main/groovy/com/palantir/baseline/plugins/BaselineClassUniquenessPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@

package com.palantir.baseline.plugins;

import com.google.common.collect.ImmutableList;
import com.palantir.baseline.tasks.CheckClassUniquenessLockTask;
import java.util.List;
import org.gradle.StartParameter;
import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.TaskProvider;
Expand All @@ -32,14 +35,25 @@
public class BaselineClassUniquenessPlugin extends AbstractBaselinePlugin {
@Override
public final void apply(Project project) {
TaskProvider<CheckClassUniquenessLockTask> lockTask =
TaskProvider<CheckClassUniquenessLockTask> checkClassUniqueness =
project.getTasks().register("checkClassUniqueness", CheckClassUniquenessLockTask.class);
project.getPlugins().apply(LifecycleBasePlugin.class);
project.getTasks().getByName(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(lockTask);
project.getTasks().getByName(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(checkClassUniqueness);

project.getPlugins().withId("java", plugin -> {
lockTask.configure(t -> t.configurations.add(
checkClassUniqueness.configure(t -> t.configurations.add(
project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)));
});

// Wire up dependencies so running `./gradlew --write-locks` will update the lock file
StartParameter startParam = project.getGradle().getStartParameter();
if (startParam.isWriteDependencyLocks()
&& !startParam.getTaskNames().contains(checkClassUniqueness.getName())) {
List<String> taskNames = ImmutableList.<String>builder()
.addAll(startParam.getTaskNames())
.add(checkClassUniqueness.getName())
.build();
startParam.setTaskNames(taskNames);
}
}
}
2 changes: 1 addition & 1 deletion ...src/test/groovy/com/palantir/baseline/BaselineClassUniquenessPluginIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class BaselineClassUniquenessPluginIntegrationTest extends AbstractPluginTest {
result.getOutput().contains("javax.el.ArrayELResolver");
!lockfile.exists()

with("checkClassUniqueness", "--write-locks").build()
with("--write-locks").build()
lockfile.exists()

File expected = new File("src/test/resources/com/palantir/baseline/baseline-class-uniqueness.expected.lock")
Expand Down