File tree Expand file tree Collapse file tree
src/main/java/org/javamodularity/moduleplugin/tasks Expand file tree Collapse file tree Original file line number Diff line number Diff line change 33import org .gradle .api .Project ;
44import org .gradle .api .plugins .ApplicationPlugin ;
55import org .gradle .api .tasks .JavaExec ;
6+ import org .gradle .util .GradleVersion ;
67
78public class RunTask extends AbstractModulePluginTask {
89
@@ -18,7 +19,11 @@ private void doConfigureRun() {
1819 if (helper ().shouldFixEffectiveArguments ()) {
1920 project .getTasks ().replace (ApplicationPlugin .TASK_RUN_NAME , ModularJavaExec .class );
2021 }
21- var mutator = new RunTaskMutator (getRunTask (), project );
22+ JavaExec runTask = getRunTask ();
23+ if (GradleVersion .current ().compareTo (GradleVersion .version ("6.4" )) >= 0 ) {
24+ runTask .getModularity ().getInferModulePath ().set (false );
25+ }
26+ var mutator = new RunTaskMutator (runTask , project );
2227 mutator .configureRun ();
2328 project .afterEvaluate (p -> configureStartScripts ());
2429 }
Original file line number Diff line number Diff line change 1111import org .gradle .api .plugins .JavaPlugin ;
1212import org .gradle .api .tasks .SourceSet ;
1313import org .gradle .api .tasks .testing .Test ;
14+ import org .gradle .util .GradleVersion ;
1415import org .javamodularity .moduleplugin .TestEngine ;
1516import org .javamodularity .moduleplugin .extensions .TestModuleOptions ;
1617import org .javamodularity .moduleplugin .extensions .PatchModuleContainer ;
@@ -42,6 +43,9 @@ public void configureTestJava() {
4243 private void configureTestJava (Test testJava ) {
4344 var testModuleOptions = testJava .getExtensions ().create ("moduleOptions" , TestModuleOptions .class , project );
4445
46+ if (GradleVersion .current ().compareTo (GradleVersion .version ("6.4" )) >= 0 ) {
47+ testJava .getModularity ().getInferModulePath ().set (false );
48+ }
4549 // don't convert to lambda: https://github.com/java9-modularity/gradle-modules-plugin/issues/54
4650 testJava .doFirst (new Action <Task >() {
4751 @ Override
You can’t perform that action at this time.
0 commit comments