Skip to content

Commit 5b42019

Browse files
authored
Improve registerMainClassTask implementation (#12632)
Register a new findMainClassTask or extend if the one already exists from Spring Boot
1 parent 8cb293c commit 5b42019

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,13 +496,17 @@ class GrailsGradlePlugin extends GroovyPlugin {
496496
@CompileStatic
497497
protected void registerFindMainClassTask(Project project) {
498498
TaskContainer taskContainer = project.tasks
499-
if (taskContainer.findByName("findMainClass") == null) {
500-
def findMainClassTask = project.tasks.create(name: "findMainClass", type: FindMainClassTask, overwrite: true)
499+
def findMainClassTask = taskContainer.findByName("findMainClass")
500+
if (findMainClassTask == null) {
501+
findMainClassTask = project.tasks.create(name: "findMainClass", type: FindMainClassTask, overwrite: true)
501502
findMainClassTask.mustRunAfter project.tasks.withType(GroovyCompile)
502503
def bootRepackageTask = project.tasks.findByName("bootRepackage")
503504
if (bootRepackageTask) {
504505
bootRepackageTask.dependsOn findMainClassTask
505506
}
507+
} else if (!FindMainClassTask.class.isAssignableFrom(findMainClassTask.class)) {
508+
def grailsFindMainClass = project.tasks.create(name: "grailsFindMainClass", type: FindMainClassTask)
509+
findMainClassTask.dependsOn(grailsFindMainClass)
506510
}
507511
}
508512

0 commit comments

Comments
 (0)