ensure tasks that use moduleJvmArgs have task inputs set correctly (#…

…2477)

add input properties for each task that uses moduleJvmArgs so that when the extension value changes, the task will no longer be up-to-date.

changelog/@unreleased/pr-2477.v2.yml

@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: add input properties for each task that uses moduleJvmArgs so that
+    when the extension value changes, the task will no longer be up-to-date.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2477

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineModuleJvmArgs.java

@@ -111,6 +111,8 @@ public Iterable<String> asArguments() {
                                     return arguments;
                                 }
                             });
+
+                    setTaskInputsFromExtension(javaCompile, extension);
                 });
 
                 TaskProvider<Task> javadocTaskProvider = null;
@@ -175,6 +177,8 @@ public void execute(Task task) {
                                 }
                             }
                         });
+
+                        setTaskInputsFromExtension(javadocTask, extension);
                     });
                 }
             });
@@ -198,6 +202,8 @@ public Iterable<String> asArguments() {
                             return arguments;
                         }
                     });
+
+                    setTaskInputsFromExtension(test, extension);
                 }
             });
 
@@ -220,6 +226,8 @@ public Iterable<String> asArguments() {
                             return arguments;
                         }
                     });
+
+                    setTaskInputsFromExtension(javaExec, extension);
                 }
             });
 
@@ -256,11 +264,19 @@ public void execute(Manifest manifest) {
                             });
                         }
                     });
+
+                    setTaskInputsFromExtension(jar, extension);
                 }
             });
         });
     }
 
+    private static void setTaskInputsFromExtension(Task task, BaselineModuleJvmArgsExtension extension) {
+        task.getInputs().property("baseline-module-jvm-args-extension-exports", extension.exports());
+        task.getInputs().property("baseline-module-jvm-args-extension-opens", extension.opens());
+        task.getInputs().property("baseline-module-jvm-args-extension-enablePreview", extension.getEnablePreview());
+    }
+
     private static void addManifestAttribute(
             Jar jarTask, Manifest manifest, String attributeName, Provider<Set<String>> valueProperty) {
         Project project = jarTask.getProject();

gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineModuleJvmArgsIntegrationTest.groovy

@@ -426,4 +426,47 @@ class BaselineModuleJvmArgsIntegrationTest extends IntegrationSpec {
         ExecutionResult result = runTasksWithFailure('jar')
         result.standardError.contains('separated by a single slash')
     }
+
+    def 'Task not up-to-date when extension value changes'() {
+        when:
+        buildFile << '''
+        application {
+            mainClass = 'com.Example'
+        }
+
+        moduleJvmArgs {
+           exports = ['java.management/sun.management']
+        }
+        '''.stripIndent(true)
+        writeJavaSourceFile('''
+        package com;
+        public class Example {
+            public static void main(String[] args) {
+                System.out.println(String.join(
+                    " ",
+                    java.lang.management.ManagementFactory.getRuntimeMXBean().getInputArguments()));
+            }
+        }
+        '''.stripIndent(true))
+
+        ExecutionResult resultBeforeChange = runTasksSuccessfully('jar')
+
+        buildFile.text = standardBuildFile + '''
+        application {
+            mainClass = 'com.Example\'
+        }
+
+        moduleJvmArgs {
+           exports = ['java.management/sun.management123']
+        }
+        '''.stripIndent(true)
+
+        ExecutionResult resultAfterChange = runTasksSuccessfully('jar')
+
+        then:
+        !resultBeforeChange.wasUpToDate('jar')
+        resultBeforeChange.wasExecuted('jar')
+        !resultAfterChange.wasUpToDate('jar')
+        resultAfterChange.wasExecuted('jar')
+    }
 }