From 78482cac3dc7aa0daf93ae61ed86b9d5595d40cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schalk=20W=2E=20Cronj=C3=A9?= <ysb33r@gmail.com>
Date: Sat, 23 Mar 2019 11:06:54 +0100
Subject: [PATCH] Prevent AsciidoctorJExtension from being ExtensionAware
 (#284,#298)

As per a recommendation from @bamboo in gradle/kotlin-dsl#1353.
---
 .gitlab-ci.yml                                | 32 +++++++++----------
 .../gradle/jvm/AsciidoctorJExtension.groovy   |  2 ++
 gradle/compatibility-tests.gradle             | 10 +++---
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c16d310a8..a2830836a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,22 +142,22 @@ test:gradle_5.0,5.1.1:
     expire_in: 10 days
     when: on_failure
 
-#test:gradle_5.3:
-#  stage: test
-#  image: openjdk:11
-#  except:
-#  - pages
-#  - gh-pages
-#  - tags
-#  dependencies:
-#  - jdk11
-#  script: ./run-compatibility-test-on-ci.sh
-#  artifacts:
-#    paths:
-#      - '*/build/reports'
-#      - '*/build/jacoco'
-#    expire_in: 10 days
-#    when: on_failure
+test:gradle_5.3:
+  stage: test
+  image: openjdk:11
+  except:
+  - pages
+  - gh-pages
+  - tags
+  dependencies:
+  - jdk11
+  script: ./run-compatibility-test-on-ci.sh
+  artifacts:
+    paths:
+      - '*/build/reports'
+      - '*/build/jacoco'
+    expire_in: 10 days
+    when: on_failure
 
 #jacoco:
 #  stage: reports
diff --git a/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJExtension.groovy b/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJExtension.groovy
index d5d5502ee..3bc722814 100644
--- a/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJExtension.groovy
+++ b/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJExtension.groovy
@@ -22,6 +22,7 @@ import org.asciidoctor.gradle.base.SafeMode
 import org.asciidoctor.gradle.base.Transform
 import org.gradle.api.Action
 import org.gradle.api.GradleException
+import org.gradle.api.NonExtensible
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
@@ -47,6 +48,7 @@ import static org.ysb33r.grolifant.api.StringUtils.stringize
  */
 @CompileStatic
 @SuppressWarnings('MethodCount')
+@NonExtensible
 class AsciidoctorJExtension extends AbstractCombinedProjectTaskExtension {
 
     // ------------------------------------------------------------------------
diff --git a/gradle/compatibility-tests.gradle b/gradle/compatibility-tests.gradle
index b2ea40b84..a7d76f69c 100644
--- a/gradle/compatibility-tests.gradle
+++ b/gradle/compatibility-tests.gradle
@@ -5,25 +5,25 @@ pluginManager.withPlugin('org.ysb33r.cloudci') {
         travisci {
             gradleTest {
                 if (JavaVersion.current().java11) {
-                    versions '4.8.1', '5.1.1'
+                    versions '4.8.1', '5.3'
                 } else {
-                    versions '4.0.2', '5.0'
+                    versions '4.0.2', '5.1.1'
                 }
             }
         }
         appveyor {
             gradleTest {
-                versions '4.0.2', '4.10.2', '5.0', '5.1.1'
+                versions '4.0.2', '4.10.2', '5.0', '5.3'
             }
         }
         no_ci {
             gradleTest {
                 if (JavaVersion.current().java11) {
-                    versions '4.8.1', '5.0', '5.1.1'
+                    versions '4.8.1', '5.0', '5.1.1', '5.3'
                 } else if (JavaVersion.current().java10) {
                     versions '4.7', '5.0', '5.1.1'
                 } else {
-                    versions '4.0.2', '5.0', '5.1.1'
+                    versions '4.0.2', '5.0', '5.1.1', '5.3'
                 }
             }
         }