[groovy] branch master updated: Add source dependency on task to fix task cacheability (#1837)

[sunlan]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new ca21423048 Add source dependency on task to fix task cacheability 
(#1837)
ca21423048 is described below

commit ca21423048a9a7952ba9a5b886e5c456b4cf98b5
Author: Nelson Osacky <nosa...@gradle.com>
AuthorDate: Thu Mar 2 15:01:19 2023 +0100

    Add source dependency on task to fix task cacheability (#1837)
    
    * Add source dependency on task to fix task cacheability
    
    The deprecation warning that this PR fixes can be seen [in this build 
scan](https://scans.gradle.com/s/njuvm77j3jark/deprecations?expanded=WyI1OSJd#60)
    
    * Exclude Antlr generated files from Javadoc
---
 build-logic/src/main/groovy/org.apache.groovy-core.gradle | 5 +++--
 subprojects/groovy-all/build.gradle                       | 4 +++-
 subprojects/groovy-binary/build.gradle                    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-core.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
index 876aad2a99..81d27ec052 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
@@ -194,11 +194,10 @@ tasks.withType(Test).configureEach {
     jvmArgs /*"-Dgroovy.attach.groovydoc=true", 
"-Dgroovy.attach.runtime.groovydoc=true",*/ 
"-Dgroovy.antlr4.cache.threshold=100"
 }
 
-tasks.named("generateGrammarSource") {
+def generateGrammarSourceTask = tasks.named("generateGrammarSource") {
     maxHeapSize = '1g'
     outputs.cacheIf { true }
     outputDirectory = file("${buildDir}/generated/sources/antlr4")
-    sourceSets.main.java.srcDirs += outputDirectory
 
     final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4'
     arguments += ["-visitor", "-no-listener", "-package", PARSER_PACKAGE_NAME]
@@ -219,6 +218,8 @@ tasks.named("generateGrammarSource") {
     }
 }
 
+sourceSets.main.java.srcDir generateGrammarSourceTask
+
 configurations {
     sourcesForAggregation {
         canBeConsumed = true
diff --git a/subprojects/groovy-all/build.gradle 
b/subprojects/groovy-all/build.gradle
index 817b346934..295c9041f3 100644
--- a/subprojects/groovy-all/build.gradle
+++ b/subprojects/groovy-all/build.gradle
@@ -25,6 +25,8 @@ docAggregation {
     excludeFromJavadoc '**/*.html',
             '**/*.groovy',
             '*.g4',
-            '**/GroovyRecognizer.java' // generated file
+            '**/GroovyRecognizer.java', // generated file
+            '**/*.tokens', // Antlr generated file
+            '**/*.interp' // Antlr generated file
 }
 
diff --git a/subprojects/groovy-binary/build.gradle 
b/subprojects/groovy-binary/build.gradle
index 5686cb153e..fe07112cf0 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -28,7 +28,9 @@ docAggregation {
     excludeFromJavadoc '**/*.html',
             '**/*.groovy',
             '*.g4',
-            '**/GroovyRecognizer.java' // generated file
+            '**/GroovyRecognizer.java', // generated file
+            '**/*.tokens', // Antlr generated file
+            '**/*.interp' // Antlr generated file
 }
 
 tasks.named('asciidoctor') {