You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2025/05/23 14:08:55 UTC
(grails-core) branch singleGroovy created (now 337bf414eb)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch singleGroovy
in repository https://gitbox.apache.org/repos/asf/grails-core.git
at 337bf414eb groovydoc performance
This branch includes the following new commits:
new 18c7d18d22 unified groovy version
new 3c789590af optimizing build for single groovy version
new 5d59634b15 Spring Boot 3.5.0
new 337bf414eb groovydoc performance
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-core) 01/04: unified groovy version
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch singleGroovy
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 18c7d18d22523687b11f3e88d65602e665ae1202
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Thu May 22 14:35:26 2025 -0400
unified groovy version
---
dependencies.gradle | 2 +-
gradle/docs-config.gradle | 11 -----------
gradle/docs-dependencies.gradle | 11 ++---------
grails-gradle/gradle/docs-config.gradle | 8 --------
grails-shell-cli/build.gradle | 18 +++++-------------
grails-spring/build.gradle | 2 +-
6 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index fe9cbda489..1175340681 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -132,7 +132,7 @@ ext {
'bootstrap.version' : '5.3.3',
'commons-codec.version' : '1.17.1',
'geb-spock.version' : '7.0',
- 'groovy.version' : '4.0.26',
+ 'groovy.version': '4.0.27-SNAPSHOT',
'h2.version' : '2.3.232',
'jackson.version' : '2.18.2',
'jquery.version' : '3.7.1',
diff --git a/gradle/docs-config.gradle b/gradle/docs-config.gradle
index 54d72ea135..5b5c7d1794 100644
--- a/gradle/docs-config.gradle
+++ b/gradle/docs-config.gradle
@@ -21,15 +21,4 @@ apply from: rootProject.layout.projectDirectory.file('gradle/docs-dependencies.g
ext {
includeInApiDocs = true
-}
-
-tasks.named('groovydoc', Groovydoc).configure { Groovydoc it ->
- // TODO: Fix this for testFixtures
- it.classpath = configurations.documentation
- it.groovyClasspath = configurations.documentation
- it.access = GroovydocAccess.PROTECTED
- it.includeAuthor = false
- it.includeMainForScripts = false
- it.processScripts = false
- it.noTimestamp = true
}
\ No newline at end of file
diff --git a/gradle/docs-dependencies.gradle b/gradle/docs-dependencies.gradle
index bc18092644..73f5494e17 100644
--- a/gradle/docs-dependencies.gradle
+++ b/gradle/docs-dependencies.gradle
@@ -31,20 +31,12 @@ dependencies {
add('documentation', 'org.fusesource.jansi:jansi')
add('documentation', 'jline:jline')
add('documentation', 'com.github.javaparser:javaparser-core')
-
- /*
- Temporarily use 4.0.27-SNAPSHOT for documentation generation until 4.0.27 is released.
+ // not every project includes groovy, so include it in the documentation config so it can be found
add('documentation', 'org.apache.groovy:groovy')
add('documentation', 'org.apache.groovy:groovy-groovydoc')
add('documentation', 'org.apache.groovy:groovy-ant')
add('documentation', 'org.apache.groovy:groovy-docgenerator')
add('documentation', 'org.apache.groovy:groovy-templates')
-*/
- add('documentation', 'org.apache.groovy:groovy:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-groovydoc:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-ant:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-docgenerator:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-templates:4.0.27-SNAPSHOT')
}
String resolveProjectVersion(String artifact) {
@@ -68,6 +60,7 @@ tasks.withType(Groovydoc).configureEach { Groovydoc gdoc ->
gdoc.includeAuthor = true
gdoc.includeMainForScripts = false
gdoc.processScripts = false
+ gdoc.noTimestamp = true
doFirst {
def gebVersion = resolveProjectVersion('geb-spock')
diff --git a/grails-gradle/gradle/docs-config.gradle b/grails-gradle/gradle/docs-config.gradle
index 3a6bc80bc0..ba817669f8 100644
--- a/grails-gradle/gradle/docs-config.gradle
+++ b/grails-gradle/gradle/docs-config.gradle
@@ -31,19 +31,11 @@ dependencies {
add('documentation', 'org.fusesource.jansi:jansi')
add('documentation', 'jline:jline')
add('documentation', 'com.github.javaparser:javaparser-core')
-/*
- Temporarily use 4.0.27-SNAPSHOT for documentation generation until 4.0.27 is released.
add('documentation', "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}")
add('documentation', "org.apache.groovy:groovy-groovydoc:${bomDependencyVersions['groovy.version']}")
add('documentation', "org.apache.groovy:groovy-ant:${bomDependencyVersions['groovy.version']}")
add('documentation', "org.apache.groovy:groovy-docgenerator:${bomDependencyVersions['groovy.version']}")
add('documentation', "org.apache.groovy:groovy-templates:${bomDependencyVersions['groovy.version']}")
-*/
- add('documentation', 'org.apache.groovy:groovy:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-groovydoc:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-ant:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-docgenerator:4.0.27-SNAPSHOT')
- add('documentation', 'org.apache.groovy:groovy-templates:4.0.27-SNAPSHOT')
}
ext {
diff --git a/grails-shell-cli/build.gradle b/grails-shell-cli/build.gradle
index 22c7159724..d0bf08f576 100644
--- a/grails-shell-cli/build.gradle
+++ b/grails-shell-cli/build.gradle
@@ -35,19 +35,11 @@ dependencies {
implementation platform(project(':grails-bom'))
- // compile grails-shell-cli with the Groovy version provided by Gradle
- // to ensure build compatibility with Gradle, currently Groovy 3.0.x
- // when used by grails-gradle-plugin
- // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
- compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
- compileOnly "org.codehaus.groovy:groovy-templates:$GroovySystem.version"
- compileOnly "org.codehaus.groovy:groovy-xml:$GroovySystem.version"
- compileOnly "org.codehaus.groovy:groovy-ant:$GroovySystem.version"
- compileOnly "org.codehaus.groovy:groovy-json:$GroovySystem.version"
-
- runtimeOnly 'org.apache.groovy:groovy-ant'
- runtimeOnly 'org.apache.groovy:groovy-json'
- runtimeOnly 'org.apache.groovy:groovy-xml'
+ implementation 'org.apache.groovy:groovy'
+ implementation 'org.apache.groovy:groovy-templates'
+ implementation 'org.apache.groovy:groovy-xml'
+ implementation 'org.apache.groovy:groovy-ant'
+ implementation 'org.apache.groovy:groovy-json'
api project(':grails-bootstrap')
api 'org.apache.grails.gradle:grails-gradle-model'
diff --git a/grails-spring/build.gradle b/grails-spring/build.gradle
index 91b1a53d40..da9ddbfcf0 100644
--- a/grails-spring/build.gradle
+++ b/grails-spring/build.gradle
@@ -35,7 +35,7 @@ dependencies {
api 'org.springframework:spring-context'
api project(':grails-bootstrap')
api 'org.apache.groovy:groovy'
- api ( 'org.apache.groovy:groovy-xml' )
+ api 'org.apache.groovy:groovy-xml'
testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
(grails-core) 03/04: Spring Boot 3.5.0
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch singleGroovy
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5d59634b157da73ef96d8b5276258383706e11a7
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri May 23 09:26:16 2025 -0400
Spring Boot 3.5.0
---
dependencies.gradle | 54 ++---------------------------------------------------
1 file changed, 2 insertions(+), 52 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index 1175340681..b167572f88 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -42,33 +42,8 @@ ext {
'objenesis.version' : '3.4',
'gradle-spock.version' : '2.3-groovy-3.0',
'gradle-nexus-publish-plugin.version': '2.0.0',
- 'spring-boot.version' : '3.5.0-RC1',
+ 'spring-boot.version' : '3.5.0',
'springloaded.version' : '1.2.8.RELEASE',
- // Because 3.5.0-RC1 contains 6.2.6 instead of 6.2.7, we need to override the various spring versions
- // https://github.com/spring-projects/spring-framework/issues/34796 which prevents running apps via jar (nested jar failures)
- 'spring-websocket.version' : '6.2.7',
- 'spring-webmvc.version' : '6.2.7',
- 'spring-webflux.version' : '6.2.7',
- 'spring-web.version' : '6.2.7',
- 'spring-tx.version' : '6.2.7',
- 'spring-test.version' : '6.2.7',
- 'spring-r2dbc.version' : '6.2.7',
- 'spring-oxm.version' : '6.2.7',
- 'spring-orm.version' : '6.2.7',
- 'spring-messaging.version' : '6.2.7',
- 'spring-jms.version' : '6.2.7',
- 'spring-jdbc.version' : '6.2.7',
- 'spring-jcl.version' : '6.2.7',
- 'spring-instrument.version' : '6.2.7',
- 'spring-expression.version' : '6.2.7',
- 'spring-core-test.version' : '6.2.7',
- 'spring-core.version' : '6.2.7',
- 'spring-context-support.version' : '6.2.7',
- 'spring-context-indexer.version' : '6.2.7',
- 'spring-context.version' : '6.2.7',
- 'spring-beans.version' : '6.2.7',
- 'spring-aspects.version' : '6.2.7',
- 'spring-aop.version' : '6.2.7',
]
// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -99,31 +74,6 @@ ext {
'spring-boot-cli' : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
'spring-boot-gradle' : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
'springloaded' : "org.springframework:springloaded:${gradleBomDependencyVersions['springloaded.version']}",
- // Because 3.5.0-RC1 contains 6.2.6 instead of 6.2.7, we need to override the various spring versions
- // https://github.com/spring-projects/spring-framework/issues/34796 which prevents running apps via jar (nested jar failures)
- 'spring-websocket' : "org.springframework:spring-websocket:${gradleBomDependencyVersions['spring-websocket.version']}",
- 'spring-webmvc' : "org.springframework:spring-webmvc:${gradleBomDependencyVersions['spring-webmvc.version']}",
- 'spring-webflux' : "org.springframework:spring-webflux:${gradleBomDependencyVersions['spring-webflux.version']}",
- 'spring-web' : "org.springframework:spring-web:${gradleBomDependencyVersions['spring-web.version']}",
- 'spring-tx' : "org.springframework:spring-tx:${gradleBomDependencyVersions['spring-tx.version']}",
- 'spring-test' : "org.springframework:spring-test:${gradleBomDependencyVersions['spring-test.version']}",
- 'spring-r2dbc' : "org.springframework:spring-r2dbc:${gradleBomDependencyVersions['spring-r2dbc.version']}",
- 'spring-oxm' : "org.springframework:spring-oxm:${gradleBomDependencyVersions['spring-oxm.version']}",
- 'spring-orm' : "org.springframework:spring-orm:${gradleBomDependencyVersions['spring-orm.version']}",
- 'spring-messaging' : "org.springframework:spring-messaging:${gradleBomDependencyVersions['spring-messaging.version']}",
- 'spring-jms' : "org.springframework:spring-jms:${gradleBomDependencyVersions['spring-jms.version']}",
- 'spring-jdbc' : "org.springframework:spring-jdbc:${gradleBomDependencyVersions['spring-jdbc.version']}",
- 'spring-jcl' : "org.springframework:spring-jcl:${gradleBomDependencyVersions['spring-jcl.version']}",
- 'spring-instrument' : "org.springframework:spring-instrument:${gradleBomDependencyVersions['spring-instrument.version']}",
- 'spring-expression' : "org.springframework:spring-expression:${gradleBomDependencyVersions['spring-expression.version']}",
- 'spring-core-test' : "org.springframework:spring-core-test:${gradleBomDependencyVersions['spring-core-test.version']}",
- 'spring-core' : "org.springframework:spring-core:${gradleBomDependencyVersions['spring-core.version']}",
- 'spring-context-support' : "org.springframework:spring-context-support:${gradleBomDependencyVersions['spring-context-support.version']}",
- 'spring-context-indexer' : "org.springframework:spring-context-indexer:${gradleBomDependencyVersions['spring-context-indexer.version']}",
- 'spring-context' : "org.springframework:spring-context:${gradleBomDependencyVersions['spring-context.version']}",
- 'spring-beans' : "org.springframework:spring-beans:${gradleBomDependencyVersions['spring-beans.version']}",
- 'spring-aspects' : "org.springframework:spring-aspects:${gradleBomDependencyVersions['spring-aspects.version']}",
- 'spring-aop' : "org.springframework:spring-aop:${gradleBomDependencyVersions['spring-aop.version']}",
]
bomDependencyVersions = [
@@ -132,7 +82,7 @@ ext {
'bootstrap.version' : '5.3.3',
'commons-codec.version' : '1.17.1',
'geb-spock.version' : '7.0',
- 'groovy.version': '4.0.27-SNAPSHOT',
+ 'groovy.version' : '4.0.27-SNAPSHOT',
'h2.version' : '2.3.232',
'jackson.version' : '2.18.2',
'jquery.version' : '3.7.1',
(grails-core) 02/04: optimizing build for single groovy version
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch singleGroovy
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 3c789590af221569f68af735f1177356473e0abc
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri May 23 00:46:14 2025 -0400
optimizing build for single groovy version
---
etc/bin/test-reproducible-builds.sh | 4 ++--
etc/bin/verify-distribution.sh | 2 +-
gradle.properties | 4 +++-
gradle/java-config.gradle | 2 +-
grails-data-docs/stage/build.gradle | 2 ++
grails-doc/build.gradle | 8 ++------
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/etc/bin/test-reproducible-builds.sh b/etc/bin/test-reproducible-builds.sh
index 31c171a76b..363eb9a3e6 100755
--- a/etc/bin/test-reproducible-builds.sh
+++ b/etc/bin/test-reproducible-builds.sh
@@ -28,7 +28,7 @@ cd "${SCRIPT_DIR}/../.."
rm -rf "${SCRIPT_DIR}/results" || true
mkdir -p "${SCRIPT_DIR}/results"
-git clean -xdf --exclude='etc/bin'
+git clean -xdf --exclude='etc/bin' --exclude='.idea' --exclude='.gradle'
killall -e java || true
cd grails-gradle
./gradlew build --rerun-tasks -PskipTests --no-build-cache
@@ -38,7 +38,7 @@ cd ..
mkdir -p "${SCRIPT_DIR}/results/first"
find . -path ./etc -prune -o -type f -path '*/build/libs/*.jar' -print0 | xargs -0 cp --parents -t "${SCRIPT_DIR}/results/first/"
-git clean -xdf --exclude='etc/bin'
+git clean -xdf --exclude='etc/bin' --exclude='.idea' --exclude='.gradle'
killall -e java || true
cd grails-gradle
./gradlew build --rerun-tasks -PskipTests --no-build-cache
diff --git a/etc/bin/verify-distribution.sh b/etc/bin/verify-distribution.sh
index 40b9173c8c..23855cd9bd 100755
--- a/etc/bin/verify-distribution.sh
+++ b/etc/bin/verify-distribution.sh
@@ -40,7 +40,7 @@ else
exit 1
fi
-git clean -xdf --exclude='etc/bin'
+git clean -xdf --exclude='etc/bin' --exclude='.idea' --exclude='.gradle'
killall -e java || true
cd grails-gradle
./gradlew build --rerun-tasks -PskipTests --no-build-cache
diff --git a/gradle.properties b/gradle.properties
index 6240132477..7f7c99b50c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,9 @@ org.gradle.caching=true
# org.gradle.configuration-cache=true
org.gradle.parallel=true
org.gradle.daemon=true
-org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1792M -XX:MaxMetaspaceSize=1024M
+# do NOT turn on due to https://github.com/gradle/gradle/issues/9489
+#org.gradle.configureondemand=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4G -XX:MaxMetaspaceSize=2G -XX:+UseParallelGC
# libraries only specific to test apps, these should not be exposed
jbossTransactionApiVersion=2.0.0.Final
diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle
index 6f7c3f544f..9c6c845e9c 100644
--- a/gradle/java-config.gradle
+++ b/gradle/java-config.gradle
@@ -38,7 +38,7 @@ tasks.withType(GroovyCompile).configureEach {
groovyOptions.parameters = true
options.encoding = 'UTF-8' // encoding needs to be the same since it's different across platforms
options.fork = true
- options.forkOptions.jvmArgs = ['-Xms128M', '-Xmx1G']
+ options.forkOptions.jvmArgs = ['-Xms128M', '-Xmx2G']
}
// Grails determines the grails version via the META-INF/MANIFEST.MF file
diff --git a/grails-data-docs/stage/build.gradle b/grails-data-docs/stage/build.gradle
index e9c7f7354b..aa4337d23c 100644
--- a/grails-data-docs/stage/build.gradle
+++ b/grails-data-docs/stage/build.gradle
@@ -70,6 +70,8 @@ combinedGroovydoc.configure { Groovydoc task ->
task.classpath = files(sources.collect{ SourceSet it -> it.compileClasspath.filter(File.&isDirectory) }.flatten().unique())
task.destinationDir = project.layout.buildDirectory.dir('data-api/api').get().asFile
+ task.dependsOn(docProjects.collect { ":$it.name:groovydoc" })
+
task.inputs.files(task.source)
task.outputs.dir(task.destinationDir)
}
diff --git a/grails-doc/build.gradle b/grails-doc/build.gradle
index 33d04d7665..15b717c858 100644
--- a/grails-doc/build.gradle
+++ b/grails-doc/build.gradle
@@ -26,12 +26,6 @@ plugins {
id 'groovy'
}
-// Make sure doc projects are evaluated last so they pick up all projects with documentation since they are dynamically
-// found by the aggregateGroovydoc task
-rootProject.subprojects
- .findAll { !(it.name in testProjects) && it.name != project.name && !(it.name in cliProjects) && !(it.name in profileProjects) }
- .each { project.evaluationDependsOn(it.path) }
-
compileJava.options.release = javaVersion.toInteger()
version = projectVersion
@@ -98,6 +92,8 @@ combinedGroovydoc.configure { Groovydoc gdoc ->
gdoc.classpath = files(sources.collect{ SourceSet it -> it.compileClasspath.filter(File.&isDirectory) }.flatten().unique())
gdoc.destinationDir = project.layout.buildDirectory.dir('combined-api/api').get().asFile
+ gdoc.dependsOn(docProjects.collect { ":$it.name:groovydoc" })
+
gdoc.inputs.files(gdoc.source)
gdoc.outputs.dir(gdoc.destinationDir)
}
(grails-core) 04/04: groovydoc performance
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch singleGroovy
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 337bf414eb62d126fa41218887ced8b01d21ec15
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri May 23 09:26:31 2025 -0400
groovydoc performance
---
gradle.properties | 2 +-
gradle/docs-dependencies.gradle | 1 -
grails-data-docs/stage/build.gradle | 2 --
grails-doc/build.gradle | 2 --
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 7f7c99b50c..db98149de8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -51,7 +51,7 @@ org.gradle.parallel=true
org.gradle.daemon=true
# do NOT turn on due to https://github.com/gradle/gradle/issues/9489
#org.gradle.configureondemand=true
-org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4G -XX:MaxMetaspaceSize=2G -XX:+UseParallelGC
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx5G -XX:MaxMetaspaceSize=2G
# libraries only specific to test apps, these should not be exposed
jbossTransactionApiVersion=2.0.0.Final
diff --git a/gradle/docs-dependencies.gradle b/gradle/docs-dependencies.gradle
index 73f5494e17..df7d1e8de4 100644
--- a/gradle/docs-dependencies.gradle
+++ b/gradle/docs-dependencies.gradle
@@ -31,7 +31,6 @@ dependencies {
add('documentation', 'org.fusesource.jansi:jansi')
add('documentation', 'jline:jline')
add('documentation', 'com.github.javaparser:javaparser-core')
- // not every project includes groovy, so include it in the documentation config so it can be found
add('documentation', 'org.apache.groovy:groovy')
add('documentation', 'org.apache.groovy:groovy-groovydoc')
add('documentation', 'org.apache.groovy:groovy-ant')
diff --git a/grails-data-docs/stage/build.gradle b/grails-data-docs/stage/build.gradle
index aa4337d23c..e9c7f7354b 100644
--- a/grails-data-docs/stage/build.gradle
+++ b/grails-data-docs/stage/build.gradle
@@ -70,8 +70,6 @@ combinedGroovydoc.configure { Groovydoc task ->
task.classpath = files(sources.collect{ SourceSet it -> it.compileClasspath.filter(File.&isDirectory) }.flatten().unique())
task.destinationDir = project.layout.buildDirectory.dir('data-api/api').get().asFile
- task.dependsOn(docProjects.collect { ":$it.name:groovydoc" })
-
task.inputs.files(task.source)
task.outputs.dir(task.destinationDir)
}
diff --git a/grails-doc/build.gradle b/grails-doc/build.gradle
index 15b717c858..4272265841 100644
--- a/grails-doc/build.gradle
+++ b/grails-doc/build.gradle
@@ -92,8 +92,6 @@ combinedGroovydoc.configure { Groovydoc gdoc ->
gdoc.classpath = files(sources.collect{ SourceSet it -> it.compileClasspath.filter(File.&isDirectory) }.flatten().unique())
gdoc.destinationDir = project.layout.buildDirectory.dir('combined-api/api').get().asFile
- gdoc.dependsOn(docProjects.collect { ":$it.name:groovydoc" })
-
gdoc.inputs.files(gdoc.source)
gdoc.outputs.dir(gdoc.destinationDir)
}