Skip to content

Commit b0130b7

Browse files
authored
Resolve warning in Gradle 7.2 (#201)
* test: reproduce warning in Gradle 7.2 * replace lambda with Action refs https://docs.gradle.org/7.2/userguide/validation_problems.html#implementation_unknown
1 parent 40903a2 commit b0130b7

2 files changed

Lines changed: 21 additions & 12 deletions

File tree

src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,25 @@ public void execute(Task task) {
5555
}
5656
});
5757

58-
project.getTasks().withType(Jar.class).configureEach(jar -> {
59-
File moduleInfoDir = helper().getModuleInfoDir();
60-
jar.from(moduleInfoDir);
61-
jar.doFirst(task -> {
62-
File classesDir = helper().mainSourceSet().getJava().getOutputDir();
63-
File mainModuleInfoFile = new File(classesDir, "module-info.class");
64-
File customModuleInfoFile = new File(moduleInfoDir, "module-info.class");
65-
if(mainModuleInfoFile.isFile() && customModuleInfoFile.isFile()) {
66-
mainModuleInfoFile.delete();
67-
}
68-
});
58+
// don't convert to lambda: https://docs.gradle.org/7.2/userguide/validation_problems.html#implementation_unknown
59+
project.getTasks().withType(Jar.class).configureEach(new Action<Jar>() {
60+
@Override
61+
public void execute(Jar jar) {
62+
File moduleInfoDir = CompileModuleInfoTask.this.helper().getModuleInfoDir();
63+
jar.from(moduleInfoDir);
64+
// don't convert to lambda: https://docs.gradle.org/7.2/userguide/validation_problems.html#implementation_unknown
65+
jar.doFirst(new Action<Task>() {
66+
@Override
67+
public void execute(Task task) {
68+
File classesDir = CompileModuleInfoTask.this.helper().mainSourceSet().getJava().getOutputDir();
69+
File mainModuleInfoFile = new File(classesDir, "module-info.class");
70+
File customModuleInfoFile = new File(moduleInfoDir, "module-info.class");
71+
if (mainModuleInfoFile.isFile() && customModuleInfoFile.isFile()) {
72+
mainModuleInfoFile.delete();
73+
}
74+
}
75+
});
76+
}
6977
});
7078
}
7179

src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void smokeTestDist(String projectName, String gradleVersion) {
199199

200200
@CartesianProductTest(name = "smokeTestRunDemo({arguments})")
201201
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
202-
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0"})
202+
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
203203
void smokeTestRunDemo(String projectName, String gradleVersion) {
204204
LOGGER.info("Executing smokeTestRunDemo with Gradle {}", gradleVersion);
205205
var result = GradleRunner.create()
@@ -212,6 +212,7 @@ void smokeTestRunDemo(String projectName, String gradleVersion) {
212212
.build();
213213

214214
assertTasksSuccessful(result, "greeter.javaexec", "runDemo1", "runDemo2");
215+
assertFalse(result.getOutput().contains("Using Java lambdas is not supported as task inputs"));
215216
}
216217

217218
@CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")

0 commit comments

Comments
 (0)