Skip to content

Commit 433661e

Browse files
authored
[Gradle] Make DistroTestPlugin configuration cache compatible (#119497) (#119523)
1 parent 95a4788 commit 433661e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.gradle.api.artifacts.Configuration;
3232
import org.gradle.api.artifacts.dsl.DependencyHandler;
3333
import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
34+
import org.gradle.api.file.FileCollection;
3435
import org.gradle.api.plugins.JavaPluginExtension;
3536
import org.gradle.api.provider.Provider;
3637
import org.gradle.api.specs.Specs;
@@ -90,8 +91,8 @@ public void apply(Project project) {
9091
Map<String, TaskProvider<?>> versionTasks = versionTasks(project, "destructiveDistroUpgradeTest", buildParams.getBwcVersions());
9192
TaskProvider<Task> destructiveDistroTest = project.getTasks().register("destructiveDistroTest");
9293

93-
Configuration examplePlugin = configureExamplePlugin(project);
94-
94+
Configuration examplePluginConfiguration = configureExamplePlugin(project);
95+
FileCollection examplePluginFileCollection = examplePluginConfiguration;
9596
List<TaskProvider<Test>> windowsTestTasks = new ArrayList<>();
9697
Map<ElasticsearchDistributionType, List<TaskProvider<Test>>> linuxTestTasks = new HashMap<>();
9798

@@ -104,9 +105,9 @@ public void apply(Project project) {
104105
t2 -> distribution.isDocker() == false || dockerSupport.get().getDockerAvailability().isAvailable()
105106
);
106107
addDistributionSysprop(t, DISTRIBUTION_SYSPROP, distribution::getFilepath);
107-
addDistributionSysprop(t, EXAMPLE_PLUGIN_SYSPROP, () -> examplePlugin.getSingleFile().toString());
108+
addDistributionSysprop(t, EXAMPLE_PLUGIN_SYSPROP, () -> examplePluginFileCollection.getSingleFile().toString());
108109
t.exclude("**/PackageUpgradeTests.class");
109-
}, distribution, examplePlugin.getDependencies());
110+
}, distribution, examplePluginConfiguration.getDependencies());
110111

111112
if (distribution.getPlatform() == Platform.WINDOWS) {
112113
windowsTestTasks.add(destructiveTask);

0 commit comments

Comments
 (0)