Merge branch 'master' into development-4.x

.github/workflows/build.yml → .github/workflows/build.yaml

@@ -1,5 +1,14 @@
 name: Build
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - '*.adoc'
+      - docs/**
+  pull_request:
+    paths-ignore:
+      - '*.adoc'
+      - docs/**
+
 jobs:
   check:
     runs-on: ubuntu-latest

.sdkmanrc

@@ -1,3 +1,3 @@
- # Enable auto-env through the sdkman_auto_env config
+# Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.302-open
+java=11.0.22-tem

README.adoc

@@ -1,26 +1,11 @@
 = Asciidoctor Gradle Plugin
 Andres Almiray <https://github.com/aalmiray[@aalmiray]>
-:version: 4.0.0
-:version-published: 4.0.0-alpha.1
-:asciidoc-url: http://asciidoc.org
-:asciidoctor-url: http://asciidoctor.org
-:issues: https://github.com/asciidoctor/asciidoctor-maven-plugin/issues
+:asciidoc-url: https://asciidoc.org
+:asciidoctor-url: https://asciidoctor.org
 :gradle-url: http://gradle.org/
-:asciidoctor-maven-plugin: https://github.com/asciidoctor/asciidoctor-maven-plugin
-:kotlindsl: https://github.com/gradle/kotlin-dsl[Gradle Kotlin DSL]
-:lightguard: https://github.com/LightGuard
-:asciidoctorj: https://github.com/asciidoctor/asciidoctorj
-:asciidoctorj-name: AsciidoctorJ
-:asciidoctorjs-name: Asciidoctor.js
-:asciidoctorj-epub-name: Asciidoctorj-EPUB
-:asciidoctorj-pdf-name: Asciidoctorj-PDF
-:lordofthejars: https://github.com/lordofthejars
-:asciidoctor-docs: http://asciidoctor.org/docs/
 :asciidoctor-development-docs: https://asciidoctor.github.io/asciidoctor-gradle-plugin/
-:plugin-name: Asciidoctor Gradle plugin
-:project-name: asciidoctor-gradle-plugin
 :project-full-path: asciidoctor/asciidoctor-gradle-plugin
-:github-branch: development-4.x
+:github-branch: master
 :linkattrs:
 ifndef::env-github[:icons: font]
 ifdef::env-github,env-browser[]
@@ -36,21 +21,21 @@ ifdef::env-github[]
 endif::[]
 
 ifdef::status[]
-image:https://github.com/asciidoctor/asciidoctor-gradle-plugin/workflows/Build/badge.svg[GitHub Actions Status, link=https://github.com/asciidoctor/asciidoctor-gradle-plugin/actions]
-image:http://img.shields.io/coveralls/{project-full-path}/{github-branch}.svg[Coverage Status, link=https://coveralls.io/r/{project-full-path}]
-image:http://img.shields.io/badge/license-ASF2-blue.svg[Apache License 2, link=http://www.apache.org/licenses/LICENSE-2.0.txt]
+image:https://github.com/asciidoctor/asciidoctor-gradle-plugin/workflows/Build/badge.svg[GitHub Actions Status,link=https://github.com/asciidoctor/asciidoctor-gradle-plugin/actions]
+image:http://img.shields.io/coveralls/{project-full-path}/{github-branch}.svg[Coverage Status,link=https://coveralls.io/r/{project-full-path}]
+image:http://img.shields.io/badge/license-ASF2-blue.svg[Apache License 2,link=http://www.apache.org/licenses/LICENSE-2.0.txt]
 image:https://gitlab.com/asciidoctor/asciidoctor-gradle-plugin/badges/master/pipeline.svg[link="https://gitlab.com/asciidoctor/asciidoctor-gradle-plugin/commits/master",title="pipeline status"]
 endif::[]
 
 The {doctitle} is the official means of using {asciidoctor-url}[Asciidoctor] to convert all your {asciidoc-url}[AsciiDoc] documentation using {gradle-url}[Gradle].
 
-Documentation:: We are migrating our documentation to the new Asciidoctor Antora-based site when it is ready. In the meantime you can read a snapshot of the new documentation at {asciidoctor-development-docs}{github-branch}
+Documentation:: We are migrating our documentation to the new Asciidoctor Antora-based site when it is ready.
+In the meantime you can read a snapshot of the current documentation at {asciidoctor-development-docs}{github-branch}
 
 ifdef::env-github[]
-Structure:: `master` now represents the code for the latest 3.x release of these plugins.
+Structure:: `master` now represents the code for the latest 4.x release of these plugins.
 Development for 4.x is against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-4.x[{github-branch}] branch.
 PRs are preferably taking against this branch.
 The 3.x series of the plugin is now in maintenance only mode.
 PRs for that should be raised against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-3.x[maintenance-3.x]branches.
 endif::[]
-

base/src/main/groovy/org/asciidoctor/gradle/base/AbstractImplementationEngineExtension.groovy

@@ -52,7 +52,8 @@ class AbstractImplementationEngineExtension
        tag::extension-property[]
         attributes:: Asciidoctor attributes.
           Use `attributes` to append and `setAttributes` to replace any current attributes with a new set.
-          Attribute values are lazy-evaluated to strings. See <<attributes>> for more detail.
+          Attribute values are lazy-evaluated to strings.
+          See <<options-and-attributes,Setting Attributes>> for more detail.
        end::extension-property[]
        ------------------------- */
 

build.gradle

@@ -133,7 +133,7 @@ subprojects {
                     eachDependency { DependencyResolveDetails details ->
                         if (details.requested.group == 'org.codehaus.groovy') {
                             details.useVersion GroovySystem.version
-                            details.because 'THe same version as Grodale Groovy is required'
+                            details.because 'The same version as Gradle Groovy is required'
                         }
                     }
                 }
@@ -172,7 +172,7 @@ subprojects {
 
 apply from: 'gradle/coveralls.gradle'
 
-task syncWrapper( type : Copy ) {
+task syncWrapper(type: Copy) {
     from 'gradle', {
         include 'wrapper/**'
     }

docs/antora.yml

@@ -0,0 +1,32 @@
+name: gradle-plugin
+title: Gradle Plugin Suite
+version: '4.0'
+asciidoc:
+  attributes:
+    release-version: 4.0.2
+    project-full-path: asciidoctor/asciidoctor-gradle-plugin
+    project-name: asciidoctor-gradle-plugin
+    project-repo-url: https://github.com/asciidoctor/asciidoctor-gradle-plugin
+    plugin-name: Asciidoctor Gradle plugin
+    asciidoc-url: https://asciidoc.org
+    asciidoctor-maven-plugin-name: Asciidoctor Maven Plugin
+    asciidoctor-maven-plugin-url: https://github.com/asciidoctor/asciidoctor-maven-plugin
+    asciidoctor-url: https://asciidoctor.org
+    asciidoctorj-epub-name: AsciidoctorJ EPUB3
+    asciidoctorj-epub-url: https://github.com/asciidoctor/asciidoctorj-epub3
+    asciidoctorj-name: AsciidoctorJ
+    asciidoctorj-pdf-name: AsciidoctorJ PDF
+    asciidoctorj-pdf-url: https://github.com/asciidoctor/asciidoctorj-pdf
+    asciidoctorj-url: https://github.com/asciidoctor/asciidoctorj
+    asciidoctorjs-name: Asciidoctor.js
+    asciidoctorjs-url: https://github.com/asciidoctor/asciidoctor.js
+    gradle-url: https://gradle.org/
+    issues-asciidoctorj: https://github.com/asciidoctor/asciidoctorj/issues/
+    issues-jruby: https://github.com/asciidoctor/asciidoctorj/issues/
+    jruby-name: JRuby
+    kotlindsl: https://github.com/gradle/kotlin-dsl[Gradle Kotlin DSL]
+    lightguard: https://github.com/LightGuard[Jason Porter]
+    lordofthejars: https://github.com/lordofthejars[Alex Soto]
+nav:
+  - modules/ROOT/nav.adoc
+  - modules/appendices/nav.adoc