Skip to content

Commit 7563f68

Browse files
committed
set inferModulePath to false
1 parent 73d0082 commit 7563f68

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.gradle.api.plugins.JavaPlugin;
77
import org.gradle.api.tasks.bundling.Jar;
88
import org.gradle.api.tasks.compile.JavaCompile;
9+
import org.gradle.util.GradleVersion;
910
import org.javamodularity.moduleplugin.extensions.CompileModuleOptions;
1011
import org.javamodularity.moduleplugin.internal.CompileModuleInfoHelper;
1112

@@ -74,7 +75,9 @@ public void execute(Task task) {
7475
*/
7576
private JavaCompile preconfigureCompileModuleInfoJava(JavaCompile compileJava) {
7677
var compileModuleInfoJava = helper().compileJavaTask(CompileModuleOptions.COMPILE_MODULE_INFO_TASK_NAME);
77-
78+
if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) >= 0) {
79+
compileModuleInfoJava.getModularity().getInferModulePath().set(false);
80+
}
7881
compileModuleInfoJava.setClasspath(project.files()); // empty
7982
compileModuleInfoJava.setSource(pathToModuleInfoJava());
8083
compileModuleInfoJava.getOptions().setSourcepath(project.files(pathToModuleInfoJava().getParent()));

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public void configureCompileJava() {
3737
}
3838

3939
private void configureCompileJava(JavaCompile compileJava) {
40+
if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) >= 0) {
41+
compileJava.getModularity().getInferModulePath().set(false);
42+
}
4043
var moduleOptions = compileJava.getExtensions().create("moduleOptions", CompileModuleOptions.class, project);
4144
project.afterEvaluate(p -> {
4245
adjustMainClass(compileJava);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.gradle.api.logging.Logging;
99
import org.gradle.api.plugins.JavaPlugin;
1010
import org.gradle.api.tasks.compile.JavaCompile;
11+
import org.gradle.util.GradleVersion;
1112
import org.javamodularity.moduleplugin.JavaProjectHelper;
1213
import org.javamodularity.moduleplugin.TestEngine;
1314
import org.javamodularity.moduleplugin.extensions.CompileTestModuleOptions;
@@ -34,6 +35,9 @@ public void configureCompileTestJava() {
3435
}
3536

3637
private void configureCompileTestJava(JavaCompile compileTestJava) {
38+
if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) >= 0) {
39+
compileTestJava.getModularity().getInferModulePath().set(false);
40+
}
3741
var moduleOptions = compileTestJava.getExtensions()
3842
.create("moduleOptions", CompileTestModuleOptions.class, project);
3943
project.afterEvaluate(p -> {

0 commit comments

Comments
 (0)