Merge branch '3.0.x' of github.com:grails/grails-core into 3.0.x

graemerocher · graemerocher · commit 58176014377b · 2016-03-01T10:38:54.000+01:00
diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
@@ -92,7 +92,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
     }
 
     protected Task createBuildPropertiesTask(Project project) {
-
         def buildInfoFile = project.file("${project.buildDir}/grails.build.info")
 
         def buildPropertiesTask = project.tasks.create("buildProperties")
@@ -106,7 +105,7 @@ class GrailsGradlePlugin extends GroovyPlugin {
         buildPropertiesTask << {
             project.buildDir.mkdirs()
             ant.propertyfile(file: buildInfoFile) {
-                for(me in buildPropertiesContents) {
+                for(me in buildPropertiesTask.inputs.properties) {
                     entry key: me.key, value: me.value
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ class GrailsGradlePlugin extends GroovyPlugin {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`protected Task createBuildPropertiesTask(Project project) {`
`95`		`-`
`96`	`95`	`def buildInfoFile = project.file("${project.buildDir}/grails.build.info")`
`97`	`96`
`98`	`97`	`def buildPropertiesTask = project.tasks.create("buildProperties")`
`@@ -106,7 +105,7 @@ class GrailsGradlePlugin extends GroovyPlugin {`
`106`	`105`	`buildPropertiesTask << {`
`107`	`106`	`project.buildDir.mkdirs()`
`108`	`107`	`ant.propertyfile(file: buildInfoFile) {`
`109`		`- for(me in buildPropertiesContents) {`
	`108`	`+ for(me in buildPropertiesTask.inputs.properties) {`
`110`	`109`	`entry key: me.key, value: me.value`
`111`	`110`	`}`
`112`	`111`	`}`