Skip to content

Commit 34ab4a4

Browse files
authored
[Gradle] Make DistroTestPlugin configuration cache compatible (#119497)
1 parent a268dee commit 34ab4a4

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

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

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

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

0 commit comments

Comments
 (0)