Skip to content

Commit 691ee6d

Browse files
committed
Build: fix eclipse after icTests (#56362)
We made a small mistake when breaking out the `ESIntegTestCase` subclasses that confused eclipse. This makes it happy again. Poor eclipse! Relates #55896
1 parent 9c1a112 commit 691ee6d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.gradle.plugins.ide.eclipse.model.EclipseModel;
4242
import org.gradle.plugins.ide.idea.model.IdeaModel;
4343

44+
import java.util.ArrayList;
4445
import java.util.Arrays;
4546
import java.util.List;
4647
import java.util.Map;
@@ -170,7 +171,12 @@ public static TaskProvider<?> addTestSourceSet(Project project, String sourceSet
170171
});
171172
project.getPluginManager().withPlugin("eclipse", p -> {
172173
EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);
173-
eclipse.getClasspath().setSourceSets(List.of(testSourceSet));
174+
List<SourceSet> eclipseSourceSets = new ArrayList<>();
175+
for (SourceSet old : eclipse.getClasspath().getSourceSets()) {
176+
eclipseSourceSets.add(old);
177+
}
178+
eclipseSourceSets.add(testSourceSet);
179+
eclipse.getClasspath().setSourceSets(sourceSets);
174180
eclipse.getClasspath().getPlusConfigurations().add(runtimeClasspathConfiguration);
175181
});
176182

0 commit comments

Comments
 (0)