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 f0c1c66c120f040a1d69042c54ebde806e82ace6 Author: James Daugherty <[email protected]> AuthorDate: Sun Apr 20 16:07:27 2025 -0400 Make java doc, sourcesJar, and testSourcesJar cacheable --- .../publishing/GrailsPublishGradlePlugin.groovy | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy index 741e30fb3a..02b0279f41 100644 --- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy +++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy @@ -23,11 +23,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.file.DuplicatesStrategy -import org.gradle.api.plugins.ExtensionContainer -import org.gradle.api.plugins.ExtraPropertiesExtension -import org.gradle.api.plugins.JavaPlatformExtension -import org.gradle.api.plugins.JavaPluginExtension -import org.gradle.api.plugins.PluginManager +import org.gradle.api.plugins.* import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.publish.maven.plugins.MavenPublishPlugin import org.gradle.api.tasks.SourceSet @@ -144,10 +140,9 @@ Note: if project properties are used, the properties must be defined prior to ap isRelease = !isSnapshot if (project.version == Project.DEFAULT_VERSION) { - if(isRelease) { + if (isRelease) { project.rootProject.logger.warn("Project ${project.name} does not have a version defined. Using the gradle property `projectVersion` to assume version is ${detectedVersion}.") - } - else { + } else { project.rootProject.logger.info("Project ${project.name} does not have a version defined. Using the gradle property `projectVersion` to assume version is ${detectedVersion}.") } } @@ -351,7 +346,7 @@ Note: if project properties are used, the properties must be defined prior to ap } - if(gpe.pomCustomization) { + if (gpe.pomCustomization) { gpe.pomCustomization.delegate = delegate gpe.pomCustomization.resolveStrategy = Closure.DELEGATE_FIRST gpe.pomCustomization.call() @@ -511,6 +506,8 @@ Note: if project properties are used, the properties must be defined prior to ap task.duplicatesStrategy = DuplicatesStrategy.INCLUDE task.from groovyDocTask.outputs } + + task.outputs.cacheIf { true } } taskContainer.named('sourcesJar', Jar).configure { Jar task -> @@ -518,12 +515,16 @@ Note: if project properties are used, the properties must be defined prior to ap task.duplicatesStrategy = DuplicatesStrategy.INCLUDE // don't only include main, but any source set task.from sourceSets.collect { it.allSource } + + task.outputs.cacheIf { true } } - project.tasks.register('testSourcesJar', Jar) { + project.tasks.register('testSourcesJar', Jar).configure { it.dependsOn('testClasses') it.from project.sourceSets.test.output it.archiveClassifier.set('tests') + + it.outputs.cacheIf { true } } SourceSetContainer sourceSets = SourceSets.findSourceSets(project)
