Skip to content

Commit c49d615

Browse files
authored
[Gradle] Make DistroTestPlugin configuration cache compatible (#119497) (#119521)
1 parent 9e46ac3 commit c49d615

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;
@@ -89,8 +90,8 @@ public void apply(Project project) {
8990
Map<String, TaskProvider<?>> versionTasks = versionTasks(project, "destructiveDistroUpgradeTest", buildParams.getBwcVersions());
9091
TaskProvider<Task> destructiveDistroTest = project.getTasks().register("destructiveDistroTest");
9192

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

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

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

0 commit comments

Comments
 (0)