Prevent AsciidoctorJExtension from being ExtensionAware (#284,#298)

As per a recommendation from @bamboo in gradle/kotlin-dsl#1353.
asciidoctor · Mar 23, 2019 · 78482ca · 78482ca
1 parent 5322644
commit 78482ca
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git 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/...doctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJExtension.groovy b/...doctor-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
@@ -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'
                 }
             }
         }