issue #205: Run task builds command with unwanted arguments

Author: siordache

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

@@ -1,6 +1,7 @@
 package org.javamodularity.moduleplugin.tasks;
 
 import org.gradle.api.Project;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
@@ -64,7 +65,9 @@ public boolean isMergeRequired() {
     }
 
     public Sync createMergeClassesTask() {
-        return project.getTasks().create(MERGE_CLASSES_TASK_NAME, Sync.class);
+        Sync sync = project.getTasks().create(MERGE_CLASSES_TASK_NAME, Sync.class);
+        sync.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE);
+        return sync;
     }
 
     public FileCollection getMergeAdjustedClasspath(FileCollection classpath) {

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

@@ -25,6 +25,12 @@ public class ModularJavaExec extends JavaExec {
     @Internal
     private final List<String> ownJvmArgs = new ArrayList<>();
 
+    public ModularJavaExec() {
+        if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) >= 0) {
+            this.getModularity().getInferModulePath().set(true);
+        }
+    }
+
     List<String> getOwnJvmArgs() {
         return ownJvmArgs;
     }

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

@@ -134,7 +134,8 @@ private void removeClasspathArgs(CreateStartScripts startScriptsTask) {
         }
 
         Path batFile = outputDir.resolve(startScriptsTask.getApplicationName() + ".bat");
-        replaceScriptContent(batFile, "\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %(\\S+)%.*", "\"%JAVA_EXE%\" %JAVA_OPTS% %$1% %DEFAULT_JVM_OPTS% %CMD_LINE_ARGS%");
+//        replaceScriptContent(batFile, "\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %(\\S+)%.*", "\"%JAVA_EXE%\" %JAVA_OPTS% %$1% %DEFAULT_JVM_OPTS% %CMD_LINE_ARGS%");
+        replaceScriptContent(batFile, "\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %(\\S+)%.*", "\"%JAVA_EXE%\" %JAVA_OPTS% %$1% %DEFAULT_JVM_OPTS% %*");
     }
 
     private static void replaceLibsPlaceHolder(Path path, String libText, String patchLibText) {

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

@@ -38,7 +38,7 @@ void before() throws IOException {
 
     @CartesianProductTest(name = "smokeTest({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.1", "7.2"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTest(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTest of {} with Gradle {}", projectName, gradleVersion);
         if(!checkCombination(projectName, gradleVersion)) return;
@@ -86,7 +86,7 @@ void smokeTestRun(String projectName, String gradleVersion) {
 
     @CartesianProductTest(name = "smokeTestJunit5({arguments})")
     @CartesianValueSource(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestJunit5(String junitVersionPair, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestJunit5 with junitVersionPair {} and Gradle {}", junitVersionPair, gradleVersion);
         var junitVersionParts = junitVersionPair.split("/");
@@ -107,8 +107,7 @@ void smokeTestJunit5(String junitVersionPair, String gradleVersion) {
     }
 
     @CartesianProductTest(name = "smokeTestMixed({arguments})")
-    // It currently fails with Gradle 7.0
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3"/*, "7.0"*/})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestMixed(String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestMixed with Gradle {}", gradleVersion);
         var result = GradleRunner.create()
@@ -220,8 +219,7 @@ void smokeTestRunDemo(String projectName, String gradleVersion) {
 
     @CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    // Fails with Gradle versions >= 6.6.
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0", "7.2"*/})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.2"})
     void smokeTestRunStartScripts(String projectName, String gradleVersion) {
         LOGGER.lifecycle("Executing smokeTestRunScripts of {} with Gradle {}", projectName, gradleVersion);
         if(!checkCombination(projectName, gradleVersion)) return;

test-project-groovy/greeter.javaexec/build.gradle

@@ -1,3 +1,4 @@
+import org.gradle.util.GradleVersion
 import org.javamodularity.moduleplugin.tasks.ModularJavaExec
 
 dependencies {
@@ -17,7 +18,12 @@ new File("$projectDir/src/main/groovy/demo").eachFileMatch(~/Demo.*\.groovy/) {
     task "run$demoClassName"(type: ModularJavaExec) {
         group = 'Demo'
         description = "Run the $demoClassName program"
-        main = "greeter.javaexec/demo.$demoClassName"
+        if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) < 0) {
+            main = "greeter.javaexec/demo.$demoClassName"
+        } else {
+            mainClass = "demo.$demoClassName"
+            mainModule = 'greeter.javaexec'
+        }
         jvmArgs = ['-Dgreeter.sender=gradle-modules-plugin']
     }
 }

test-project-kotlin/greeter.javaexec/build.gradle.kts

@@ -21,7 +21,8 @@ File("${project.projectDir}/src/main/kotlin/demo")
             tasks.create<ModularJavaExec>("run$demoClassName") {
                 group = "Demo"
                 description = "Run the $demoClassName program"
-                main = "$moduleName/demo.${demoClassName}Kt"
+                mainClass.set("demo.${demoClassName}Kt")
+                mainModule.set(moduleName)
                 jvmArgs = listOf("-Xmx128m")
             }
         }

test-project-mixed/greeter.provider-jdk8/build.gradle

@@ -1,3 +1,7 @@
 modularity.mixedJavaRelease 8
 
 apply from: "$rootDir/gradle/shared/greeter.provider.gradle"
+
+jar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}

test-project/greeter.javaexec/build.gradle

@@ -1,3 +1,4 @@
+import org.gradle.util.GradleVersion
 import org.javamodularity.moduleplugin.tasks.ModularJavaExec
 
 dependencies {
@@ -17,7 +18,12 @@ new File("$projectDir/src/main/java/demo").eachFileMatch(~/Demo.*\.java/) { file
     task "run$demoClassName"(type: ModularJavaExec) {
         group = 'Demo'
         description = "Run the $demoClassName program"
-        main = "greeter.javaexec/demo.$demoClassName"
+        if(GradleVersion.current().compareTo(GradleVersion.version("6.4")) < 0) {
+            main = "greeter.javaexec/demo.$demoClassName"
+        } else {
+            mainClass = "demo.$demoClassName"
+            mainModule = 'greeter.javaexec'
+        }
         jvmArgs = ['-Dgreeter.sender=gradle-modules-plugin']
     }
 }