This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b6c9b6de157c081ac45ae888dd3bd4fe0887e47e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jan 13 12:42:05 2024 +1000
GROOVY-11283: Bump Gradle to 7.6.3 (cont'd)
---
build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle | 6 ++++++
build-logic/src/main/groovy/org.apache.groovy-distribution.gradle | 3 +++
2 files changed, 9 insertions(+)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 7b1d4bb3c3..f226c849b3 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -36,6 +36,11 @@ configurations {
artifact tasks.named('asciidoctor')
}
}
+ asciidocExtensions
+}
+
+dependencies {
+ asciidocExtensions gradleApi()
}
tasks.withType(AbstractAsciidoctorTask).configureEach {
@@ -45,6 +50,7 @@ tasks.withType(AbstractAsciidoctorTask).configureEach {
asciidoctor {
baseDirFollowsSourceFile()
+ configurations 'asciidocExtensions'
def (full, major, minor, patch, flavor) = (groovyVersion =~
/(\d+)\.(\d++)\.(\d+)(?:-(.+))?/)[0]
logDocuments = true
sourceDir = project.file('src/spec/doc')
diff --git a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
index 2e4ff94bfc..0c8563fbcd 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
@@ -78,6 +78,7 @@ configurations {
allSourcesRuntimeClasspath {
extendsFrom baseProjects
}
+ asciidocExtensions
}
dependencies {
@@ -109,6 +110,7 @@ dependencies {
}
doc projects.groovyAll
docgeneratorTool projects.groovyDocgenerator
+ asciidocExtensions gradleApi()
}
def docGDK = tasks.register('docGDK', DocGDK) {
@@ -202,6 +204,7 @@ tasks.register("asciidocAll", Copy) {
tasks.named('asciidoctorPdf') {
baseDirFollowsSourceFile()
+ configurations 'asciidocExtensions'
logDocuments = true
sourceDir = file('src/spec/doc')
outputDir = "$buildDir/asciidocAll/pdf"
