Merge pull request #423 from gsartori/7.0.x

Removed gradle 'application' plugin from the application template
grails · Nov 9, 2024 · a875736 · a875736
2 parents 6528fef + 48607f9
commit a875736
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/...core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw b/...core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw
@@ -49,13 +49,6 @@ repositories {
 
 @dependencies.template(applicationType, project, features, gradleBuild)
 
-@if (features.mainClass().isPresent()) {
-application {
-    mainClass.set("@features.mainClass().get()")
-}
-
-}
-
 @if(features.contains("geb-with-webdriver-binaries")) {
 // geb-with-webdriver-binaries is limited to Gradle 8.6 with max JDK 21
 compileJava.options.release = @JdkVersion.valueOf(Math.min(features.javaVersion().majorVersion(), JdkVersion.JDK_21.majorVersion())).majorVersion()

diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/GrailsApplication.java b/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/GrailsApplication.java
@@ -53,7 +53,6 @@ public void apply(GeneratorContext generatorContext) {
         GrailsApplicationFeature.super.apply(generatorContext);
         final ApplicationType applicationType = generatorContext.getApplicationType();
         if (shouldGenerateApplicationFile(applicationType, generatorContext)) {
-            generatorContext.addBuildPlugin(GradlePlugin.builder().id("application").build());
             generatorContext.addBuildPlugin(GradlePlugin.builder().id("war").build());
             generatorContext.addTemplate("application", new RockerTemplate(getPath(),
                     application.template(applicationType, generatorContext.getProject(), generatorContext.getFeatures())));

diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/lang/GrailsApplicationSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/lang/GrailsApplicationSpec.groovy
@@ -12,7 +12,7 @@ import spock.lang.Unroll
 class GrailsApplicationSpec extends BeanContextSpec implements CommandOutputFixture {
 
     @Unroll
-    void 'Application file is generated for a #applicationType application type with gradle and referenced in build.gradle mainClassName for language: groovy'() {
+    void 'Application file is generated for a #applicationType application for language: groovy'() {
         when:
         def output = generate(applicationType,
                 new Options(TestFramework.SPOCK),
@@ -24,12 +24,6 @@ class GrailsApplicationSpec extends BeanContextSpec implements CommandOutputFixt
         applicationGroovyFile.contains("@CompileStatic")
         !applicationGroovyFile.contains("@PluginSource")
 
-        when:
-        def buildGradle = output['build.gradle']
-
-        then:
-        buildGradle.contains('mainClass.set("example.grails.Application")')
-
         where:
         applicationType << [ApplicationType.WEB, ApplicationType.REST_API]
     }