Merge branch '6.2.x' into merge-6.2.x-into-7.0.x-11-1-2024

asset-pipeline changes were not needed, since asset-pipeline-gradle 5.0.x defaults to skipNonDigests = true # Conflicts: # grails-forge-core/src/test/groovy/org/grails/forge/feature/grailsWrapper/GrailsWrapperSpec.groovy
grails · Nov 1, 2024 · 27c26d4 · 27c26d4
2 parents 060f525 + 8cf161f
commit 27c26d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 41 deletions.
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/grailsWrapper/GrailsWrapper.java b/grails-forge-core/src/main/java/org/grails/forge/feature/grailsWrapper/GrailsWrapper.java
@@ -19,10 +19,21 @@
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.OperatingSystem;
 import org.grails.forge.application.generator.GeneratorContext;
+import org.grails.forge.feature.Category;
+import org.grails.forge.feature.DefaultFeature;
+import org.grails.forge.feature.Feature;
+import org.grails.forge.options.Options;
 import org.grails.forge.template.BinaryTemplate;
 
+import java.util.Set;
+
 @Singleton
-public class GrailsWrapper implements GrailsWrapperFeature {
+public class GrailsWrapper implements DefaultFeature {
+
+    @Override
+    public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
+        return true;
+    }
 
     @Override
     public String getName() {
@@ -41,7 +52,7 @@ public String getDescription() {
 
     @Override
     public boolean isVisible() {
-        return true;
+        return false;
     }
 
     @Override
@@ -59,4 +70,9 @@ public void apply(GeneratorContext generatorContext) {
     public boolean supports(ApplicationType applicationType) {
         return true;
     }
+
+    @Override
+    public String getCategory() {
+        return Category.DEV_TOOLS;
+    }
 }
diff --git a/...forge-core/src/main/java/org/grails/forge/feature/grailsWrapper/GrailsWrapperFeature.java b/...forge-core/src/main/java/org/grails/forge/feature/grailsWrapper/GrailsWrapperFeature.java
diff --git a/...orge-core/src/test/groovy/org/grails/forge/feature/grailsWrapper/GrailsWrapperSpec.groovy b/...orge-core/src/test/groovy/org/grails/forge/feature/grailsWrapper/GrailsWrapperSpec.groovy
@@ -13,7 +13,7 @@ class GrailsWrapperSpec extends ApplicationContextSpec implements CommandOutputF
     @Unroll
     void "test grails-wrapper.jar, grailsw and grailsw.bat files are present for #applicationType application"() {
         when:
-        def output = generate(applicationType, new Options(TestFramework.SPOCK), ['grails-wrapper'])
+        def output = generate(applicationType, new Options(TestFramework.SPOCK))
 
         then:
         output.containsKey("grails-wrapper.jar")