You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/10/11 12:26:44 UTC
[groovy] branch master updated: Fix asciidoctor pdf generation
(closes #1400)
This is an automated email from the ASF dual-hosted git repository.
paulk 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 4f10c42 Fix asciidoctor pdf generation (closes #1400)
4f10c42 is described below
commit 4f10c422017b33661d689a3756ce72308f76c64d
Author: Cedric Champeau <cc...@apache.org>
AuthorDate: Sun Oct 11 14:15:42 2020 +0200
Fix asciidoctor pdf generation (closes #1400)
---
build.gradle | 1 -
buildSrc/build.gradle | 1 +
.../src/main/groovy/org.apache.groovy-distribution.gradle | 11 +++++++++++
buildSrc/src/main/groovy/org.apache.groovy-documented.gradle | 12 ------------
subprojects/groovy-binary/build.gradle | 2 +-
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 60e3463..01856c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,6 @@ buildscript {
}
plugins {
- id 'org.asciidoctor.jvm.pdf' version '3.2.0'
id 'me.champeau.buildscan-recipes' version '0.2.3'
id 'com.github.ben-manes.versions' version '0.33.0'
id 'com.github.blindpirate.osgi' version '0.0.3'
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 827c644..3a92e60 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -27,6 +27,7 @@ repositories {
dependencies {
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.2.0'
+ implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.2.0'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.17.2'
implementation 'org.nosphere.apache:creadur-rat-gradle:0.7.0'
implementation 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.1'
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle b/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
index a23942b..6632d8d 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
@@ -25,6 +25,7 @@ plugins {
id 'jvm-ecosystem'
id 'org.apache.groovy-common'
id 'org.apache.groovy-aggregating-project'
+ id 'org.asciidoctor.jvm.pdf'
}
def distributionExtension = project.extensions.create('distribution', DistributionExtension, project)
@@ -209,6 +210,16 @@ tasks.register("asciidocAll", Copy) {
into layout.buildDirectory.dir("asciidocAll/html5")
}
+tasks.named('asciidoctorPdf') {
+ baseDirFollowsSourceFile()
+ logDocuments = true
+ sourceDir = rootProject.file('src/spec/doc')
+ sources {
+ include 'index.adoc'
+ }
+ outputDir = "$buildDir/asciidocAll/pdf"
+}
+
interface Services {
@Inject
SoftwareComponentFactory getSoftwareComponentFactory()
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle b/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
index 8884914..e772358 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
@@ -84,15 +84,3 @@ tasks.withType(Groovydoc).configureEach {
link 'https://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.'
link 'https://picocli.info/apidocs/', 'picocli.'
}
-
-pluginManager.withPlugin('org.asciidoctor.jvm.pdf') {
- tasks.named('asciidoctorPdf') {
- baseDirFollowsSourceFile()
- logDocuments = true
- sourceDir = project.file('src/spec/doc')
- sources {
- include 'index.adoc'
- }
- outputDir = "$buildDir/asciidocAll/pdf"
- }
-}
\ No newline at end of file
diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 661c23a..712c843 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -115,7 +115,7 @@ distribution {
}
into('html/documentation') {
from configurations.allAsciidoc
- from rootProject.tasks.named('asciidoctorPdf')
+ from tasks.named('asciidoctorPdf')
exclude '.asciidoctor'
}
into('html/groovy-jdk') {