Skip to content

Commit ee2bfda

Browse files
committed
Throw exception in GrailsPluginGradlePlugin if both plugin.yml and plugin.groovy exist
1 parent 5c94bab commit ee2bfda

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class GrailsPluginGradlePlugin extends GrailsGradlePlugin {
4949
void apply(Project project) {
5050
super.apply(project)
5151

52+
checkForConfigurationClash(project)
53+
5254
configureAstSources(project)
5355

5456
configureProjectNameAndVersionASTMetadata(project)
@@ -227,6 +229,14 @@ withConfig(configuration) {
227229
}
228230
}
229231

232+
protected void checkForConfigurationClash(Project project) {
233+
File yamlConfig = new File(project.projectDir,"grails-app/conf/plugin.yml")
234+
File groovyConfig = new File(project.projectDir,"grails-app/conf/plugin.groovy")
235+
if (yamlConfig.exists() && groovyConfig.exists()) {
236+
throw new RuntimeException("A plugin may define a plugin.yml or a plugin.groovy, but not both")
237+
}
238+
}
239+
230240
@CompileStatic
231241
static class ExplodedDir implements PublishArtifact {
232242
final String extension = ""

0 commit comments

Comments
 (0)