Merge pull request #14971 from apache/fix-inconsistent-buildSrc

Ensure Gradle Settings file & buildSrc/build.gradle are generated during the build Phase

Author: jamesfredley

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/GradleBuildSrcFeature.java

@@ -20,6 +20,7 @@
 
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.feature.Category;
+import org.grails.forge.feature.FeaturePhase;
 import org.grails.forge.feature.OneOfFeature;
 
 public interface GradleBuildSrcFeature extends OneOfFeature {
@@ -38,4 +39,9 @@ default boolean supports(ApplicationType applicationType) {
     default String getCategory() {
         return Category.CONFIGURATION;
     }
+
+    @Override
+    default int getOrder() {
+        return FeaturePhase.BUILD.getOrder();
+    }
 }

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/GradleSettingsFileFeature.java

@@ -20,6 +20,7 @@
 
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.feature.Category;
+import org.grails.forge.feature.FeaturePhase;
 import org.grails.forge.feature.OneOfFeature;
 
 public interface GradleSettingsFileFeature extends OneOfFeature {
@@ -38,4 +39,9 @@ default boolean supports(ApplicationType applicationType) {
     default String getCategory() {
         return Category.CONFIGURATION;
     }
+
+    @Override
+    default int getOrder() {
+        return FeaturePhase.BUILD.getOrder();
+    }
 }