Workaround for #1193

freefair · Oct 10, 2024 · ccea540 · ccea540
1 parent 87051cf
commit ccea540
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java b/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java
@@ -153,24 +153,6 @@ private void handleLombokConfig(SourceSet sourceSet, TaskProvider<JavaCompile> c
 
         TaskProvider<LombokConfig> lombokConfigTask = ConfigUtil.getLombokConfigTask(project, sourceSet);
 
-        // Workaround https://github.com/freefair/gradle-plugins/issues/1193
-        if (sourceSet.getName().equals("contractTest")) {
-            project.getTasks().configureEach(task -> {
-                if (task.getName().equals("generateContractTests")) {
-                    lombokConfigTask.get().mustRunAfter(task);
-                }
-            });
-        }
-
-        // Workaround https://github.com/freefair/gradle-plugins/issues/1193
-        if (sourceSet.getName().equals("main")) {
-            project.getTasks().configureEach(task -> {
-                if (task.getName().equals("openApiGenerate")) {
-                    lombokConfigTask.get().mustRunAfter(task);
-                }
-            });
-        }
-
         compileTaskProvider.configure(javaCompile -> {
             javaCompile.getInputs().file(lombokConfigTask.get().getOutputFile())
                     .withPropertyName("lombok.config")

diff --git a/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/tasks/LombokConfig.java b/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/tasks/LombokConfig.java
@@ -9,6 +9,7 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.internal.file.FileOperations;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Optional;
@@ -43,6 +44,9 @@ public abstract class LombokConfig extends DefaultTask implements LombokTask {
     @Inject
     protected abstract FileSystemOperations getFileSystemOperations();
 
+    @Inject
+    protected abstract FileOperations getFileOperations();
+
     @Inject
     protected abstract ExecOperations getExecOperations();
 
@@ -81,8 +85,7 @@ public abstract class LombokConfig extends DefaultTask implements LombokTask {
     /**
      * Paths to java files or directories the configuration is to be printed for.
      */
-    @InputFiles
-    @PathSensitive(PathSensitivity.RELATIVE)
+    @Internal
     public abstract ConfigurableFileCollection getPaths();
 
     @OutputFile
@@ -100,6 +103,19 @@ public LombokConfig() {
         getOutputs().doNotCacheIf("Config Imports were used", t -> ((LombokConfig) t).getConfigFiles() == null);
     }
 
+    @Input
+    protected Set<String> getInputPaths() {
+        HashSet<String> paths = new HashSet<>();
+        for (File path : getPaths()) {
+            try {
+                paths.add(getFileOperations().relativePath(path));
+            } catch (Exception e) {
+                paths.add(path.toString());
+            }
+        }
+        return paths;
+    }
+
     @InputFiles
     @Optional
     @Nullable
@@ -181,13 +197,11 @@ public void exec() throws IOException {
                 Duration duration = Duration.ofNanos(System.nanoTime() - start);
                 if (duration.getSeconds() > 1) {
                     getLogger().warn("lombok config {} took {}ms", args, duration.toMillis());
-                }
-                else {
+                } else {
                     getLogger().info("lombok config {} took {}ms", args, duration.toMillis());
                 }
             }
-        }
-        else {
+        } else {
             getWorkerExecutor()
                     .classLoaderIsolation(cl -> cl.getClasspath().from(getLombokClasspath()))
                     .submit(LombokConfigAction.class, params -> {