Skip to content

Commit 134b6a5

Browse files
(cherry picked from commit d3eb8fe) Signed-off-by: Andriy Redko <drreta@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent bc76e71 commit 134b6a5

File tree

6 files changed

+7
-27
lines changed

6 files changed

+7
-27
lines changed

buildSrc/src/main/groovy/org/opensearch/gradle/test/StandaloneRestTestPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class StandaloneRestTestPlugin implements Plugin<Project> {
9898
eclipse.classpath.plusConfigurations = [project.configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME)]
9999

100100
IdeaModel idea = project.extensions.getByType(IdeaModel)
101-
idea.module.testSourceDirs += testSourceSet.java.srcDirs
101+
idea.module.testSources.from(testSourceSet.java.srcDirs)
102102
idea.module.scopes.put('TEST', [plus: [project.configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME)]] as Map<String, Collection<Configuration>>)
103103

104104
PrecommitTasks.create(project, false)

buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsTasks.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.gradle.api.tasks.testing.Test;
5353
import org.gradle.api.tasks.util.PatternFilterable;
5454
import org.gradle.api.tasks.util.PatternSet;
55-
import org.gradle.internal.Factory;
5655

5756
import javax.inject.Inject;
5857

@@ -97,20 +96,13 @@ public TestingConventionsTasks(Project project) {
9796
this.project = project;
9897
}
9998

100-
@Inject
101-
protected Factory<PatternSet> getPatternSetFactory() {
102-
throw new UnsupportedOperationException();
103-
}
104-
10599
@Input
106100
public Map<String, Set<File>> getClassFilesPerEnabledTask() {
107101
return project.getTasks().withType(Test.class).stream().filter(Task::getEnabled).collect(Collectors.toMap(Task::getPath, task -> {
108102
// See please https://docs.gradle.org/8.1/userguide/upgrading_version_8.html#test_task_default_classpath
109103
final JvmTestSuite jvmTestSuite = JvmTestSuiteHelper.getDefaultTestSuite(project).orElse(null);
110104
if (jvmTestSuite != null) {
111-
final PatternFilterable patternSet = getPatternSetFactory().create()
112-
.include(task.getIncludes())
113-
.exclude(task.getExcludes());
105+
final PatternFilterable patternSet = new PatternSet().include(task.getIncludes()).exclude(task.getExcludes());
114106

115107
final Set<File> files = jvmTestSuite.getSources()
116108
.getOutput()

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestApiTask.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.gradle.api.tasks.TaskAction;
5555
import org.gradle.api.tasks.util.PatternFilterable;
5656
import org.gradle.api.tasks.util.PatternSet;
57-
import org.gradle.internal.Factory;
5857

5958
import javax.inject.Inject;
6059

@@ -86,15 +85,10 @@ public class CopyRestApiTask extends DefaultTask {
8685
@Inject
8786
public CopyRestApiTask(Project project) {
8887
this.project = project;
89-
this.corePatternSet = getPatternSetFactory().create();
88+
this.corePatternSet = new PatternSet();
9089
this.includeCore = project.getObjects().listProperty(String.class);
9190
}
9291

93-
@Inject
94-
protected Factory<PatternSet> getPatternSetFactory() {
95-
throw new UnsupportedOperationException();
96-
}
97-
9892
@Inject
9993
protected FileSystemOperations getFileSystemOperations() {
10094
throw new UnsupportedOperationException();

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestTestsTask.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.gradle.api.tasks.TaskAction;
5555
import org.gradle.api.tasks.util.PatternFilterable;
5656
import org.gradle.api.tasks.util.PatternSet;
57-
import org.gradle.internal.Factory;
5857

5958
import javax.inject.Inject;
6059

@@ -83,15 +82,10 @@ public class CopyRestTestsTask extends DefaultTask {
8382
@Inject
8483
public CopyRestTestsTask(Project project) {
8584
this.project = project;
86-
this.corePatternSet = getPatternSetFactory().create();
85+
this.corePatternSet = new PatternSet();
8786
this.includeCore = project.getObjects().listProperty(String.class);
8887
}
8988

90-
@Inject
91-
protected Factory<PatternSet> getPatternSetFactory() {
92-
throw new UnsupportedOperationException();
93-
}
94-
9589
@Inject
9690
protected FileSystemOperations getFileSystemOperations() {
9791
throw new UnsupportedOperationException();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static void setupIdeForTestSourceSet(Project project, SourceSet testSourc
176176
Configuration runtimeClasspathConfiguration = project.getConfigurations().getByName(runtimeClasspathName);
177177
project.getPluginManager().withPlugin("idea", p -> {
178178
IdeaModel idea = project.getExtensions().getByType(IdeaModel.class);
179-
idea.getModule().setTestSourceDirs(testSourceSet.getJava().getSrcDirs());
179+
idea.getModule().getTestSources().setFrom(testSourceSet.getJava().getSrcDirs());
180180
idea.getModule().getScopes().put(testSourceSet.getName(), new HashMap<String, Collection<Configuration>>() {
181181
{
182182
put("plus", Arrays.asList(runtimeClasspathConfiguration));

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
distributionBase=GRADLE_USER_HOME
1313
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
14+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
1515
zipStoreBase=GRADLE_USER_HOME
1616
zipStorePath=wrapper/dists
17-
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
17+
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1

0 commit comments

Comments
 (0)