This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch grails-geb in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 7ed654eafc5e1eb2f328d472d36239d8bf72fad9 Author: James Daugherty <[email protected]> AuthorDate: Sun Apr 20 14:48:26 2025 -0400 Remove project. usages at execution time per Gradle Deprecation Warning --- .../views/AbstractGroovyTemplateCompileTask.groovy | 15 ++++++++++++++- .../plugin/views/gsp/GroovyPageForkCompileTask.groovy | 18 +++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/AbstractGroovyTemplateCompileTask.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/AbstractGroovyTemplateCompileTask.groovy index 280600f6d8..dbaf7ed797 100644 --- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/AbstractGroovyTemplateCompileTask.groovy +++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/AbstractGroovyTemplateCompileTask.groovy @@ -3,6 +3,7 @@ package org.grails.gradle.plugin.views import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import org.gradle.api.Action +import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.DirectoryProperty import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property @@ -28,6 +29,10 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { @Optional final Property<String> packageName + @InputFiles + @PathSensitive(PathSensitivity.RELATIVE) + final ConfigurableFileCollection grailsConfigurationPaths + @InputDirectory final DirectoryProperty srcDir @@ -54,6 +59,11 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { fileExtension = objectFactory.property(String) scriptBaseName = objectFactory.property(String) compilerName = objectFactory.property(String) + grailsConfigurationPaths = objectFactory.fileCollection() + grailsConfigurationPaths.from( + //TODO: historically this only used .yml, should it explore all configuration paths? + project.layout.projectDirectory.file("grails-app/conf/application.yml") + ) } @Override @@ -88,13 +98,16 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { javaExecSpec.minHeapSize = compileOptions.forkOptions.memoryInitialSize String packageImports = projectPackageNames.join(',') ?: packageName.get() + + String configFiles = grailsConfigurationPaths.files.collect { it.canonicalPath }.join(",") + List<String> arguments = [ srcDir.get().asFile.canonicalPath, destinationDirectory.get().asFile.canonicalPath, targetCompatibility, packageImports, packageName.get(), - project.file('grails-app/conf/application.yml').canonicalPath, + configFiles, compileOptions.encoding.get() ] as List<String> diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPageForkCompileTask.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPageForkCompileTask.groovy index 0263259edc..77dd94ec2c 100644 --- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPageForkCompileTask.groovy +++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPageForkCompileTask.groovy @@ -18,9 +18,9 @@ package org.grails.gradle.plugin.views.gsp import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import org.gradle.api.Action +import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.Directory import org.gradle.api.file.DirectoryProperty -import org.gradle.api.file.FileCollection import org.gradle.api.file.FileTree import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property @@ -51,6 +51,10 @@ abstract class GroovyPageForkCompileTask extends AbstractCompile { @Optional final Property<String> packageName + @InputFiles + @PathSensitive(PathSensitivity.RELATIVE) + final ConfigurableFileCollection grailsConfigurationPaths + @InputDirectory final DirectoryProperty srcDir @@ -73,6 +77,11 @@ abstract class GroovyPageForkCompileTask extends AbstractCompile { srcDir = objectFactory.directoryProperty() compileOptions = objectFactory.newInstance(ViewCompileOptions.class) serverpath = objectFactory.property(String) + grailsConfigurationPaths = objectFactory.fileCollection() + grailsConfigurationPaths.from( + project.layout.projectDirectory.file("grails-app/conf/application.yml"), + project.layout.projectDirectory.file("grails-app/conf/application.groovy") + ) } @@ -123,12 +132,7 @@ abstract class GroovyPageForkCompileTask extends AbstractCompile { javaExecSpec.setMaxHeapSize(compileOptions.forkOptions.memoryMaximumSize) javaExecSpec.setMinHeapSize(compileOptions.forkOptions.memoryInitialSize) - //This is the OLD Style and seems kinda silly to be hard coded this way. but restores functionality - //for now - String configFiles = [ - project.file("grails-app/conf/application.yml").canonicalPath, - project.file("grails-app/conf/application.groovy").canonicalPath - ].join(',') + String configFiles = grailsConfigurationPaths.files.collect { it.canonicalPath }.join(",") Path path = Paths.get(tmpDirPath) File tmp = Files.exists(path) ? path.toFile() : Files.createDirectories(path).toFile()
