Fix gradle up-to-date check issue

Author: admin

axelor-gradle/src/main/java/com/axelor/gradle/AxelorPlugin.java

@@ -33,13 +33,13 @@
 import java.util.Objects;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.Task;
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.plugins.JavaLibraryPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.compile.AbstractCompile;
 import org.gradle.jvm.tasks.Jar;
-import org.gradle.language.jvm.tasks.ProcessResources;
 import org.gradle.plugins.ide.eclipse.EclipsePlugin;
 import org.gradle.plugins.ide.idea.IdeaPlugin;
 import org.gradle.util.GradleVersion;
@@ -137,7 +137,9 @@ private void configureCodeGeneration(Project project) {
               task.setProcessFiles(files);
             });
 
-    GenerateCode generateCodeTask =
+    Task compileTask = project.getTasks().findByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
+    Task resourcesTask = project.getTasks().findByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME);
+    Task generateCodeTask =
         project
             .getTasks()
             .create(
@@ -148,24 +150,19 @@ private void configureCodeGeneration(Project project) {
                   task.setGroup(GenerateCode.TASK_GROUP);
                 });
 
+    // add dependencies to optimize up-to-date checks
+    dependsOn(compileTask, generateCodeTask);
+    dependsOn(resourcesTask, generateCodeTask);
     project.afterEvaluate(
         p -> {
-          AxelorUtils.findAxelorProjects(p).stream()
-              .map(dep -> dep.getTasks().findByName(GenerateCode.TASK_NAME))
-              .filter(Objects::nonNull)
-              .forEach(task -> generateCodeTask.dependsOn(task));
+          AxelorUtils.findAxelorProjects(p)
+              .forEach(
+                  d -> {
+                    dependsOn(generateCodeTask, d.getTasks().findByName(GenerateCode.TASK_NAME));
+                    dependsOn(compileTask, d.getTasks().findByName(JavaPlugin.CLASSES_TASK_NAME));
+                  });
         });
 
-    project
-        .getTasks()
-        .withType(AbstractCompile.class)
-        .all(task -> task.dependsOn(GenerateCode.TASK_NAME));
-
-    project
-        .getTasks()
-        .withType(ProcessResources.class)
-        .all(task -> task.dependsOn(GenerateCode.TASK_NAME));
-
     // add src-gen dirs
     project
         .getExtensions()
@@ -197,4 +194,10 @@ private void configureCodeGeneration(Project project) {
                       .plus(sourceSet.getCompileClasspath()));
             });
   }
+
+  private void dependsOn(Task task, Task dependency) {
+    if (task != null && dependency != null) {
+      task.dependsOn(dependency);
+    }
+  }
 }

gradle/style.gradle

@@ -22,6 +22,7 @@ spotless {
       exclude '**/webapp/lib/*'
       exclude '**/webapp/dist/*'
       exclude '**/webapp/node_modules/*'
+      exclude '**/build/*'
     }
     indentWithSpaces(2)
     trimTrailingWhitespace()
@@ -36,14 +37,22 @@ spotless {
 
 spotlessMisc.dependsOn(spotlessMarkdown)
 
-subprojects {
+subprojects { p ->
   apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin
   spotless {
     java {
       googleJavaFormat()
     }
   }
   task formatCode(dependsOn: ['licenseFormat', 'spotlessApply'])
+
+  // fix up-to-date check issue
+  p.afterEvaluate {
+    try {
+      p.spotlessJava.dependsOn(p.generateCode)
+    } catch (Exception e) {
+    }
+  }
 }
 
 task formatCode(dependsOn: 'spotlessApply')