Use LegacyLevel to detect setMain

asciidoctor · Dec 30, 2022 · 9b8c0e8 · 9b8c0e8
1 parent df63128
commit 9b8c0e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/jvm/src/intTest/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskFunctionalSpec.groovy b/jvm/src/intTest/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskFunctionalSpec.groovy
@@ -17,15 +17,13 @@ package org.asciidoctor.gradle.jvm
 
 import org.asciidoctor.gradle.internal.FunctionalSpecification
 import org.gradle.testkit.runner.GradleRunner
-import org.gradle.testkit.runner.TaskOutcome
 import spock.lang.Issue
 import spock.lang.Timeout
 import spock.lang.Unroll
 
 import static org.asciidoctor.gradle.testfixtures.AsciidoctorjTestVersions.SERIES_20
 @java.lang.SuppressWarnings('NoWildcardImports')
 import static org.asciidoctor.gradle.testfixtures.JRubyTestVersions.*
-import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class AsciidoctorTaskFunctionalSpec extends FunctionalSpecification {
 
@@ -223,7 +221,7 @@ class AsciidoctorTaskFunctionalSpec extends FunctionalSpecification {
     @Issue('https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/368')
     void 'Docinfo files are processed'() {
         given:
-        getBuildFile( '''
+        getBuildFile('''
         asciidoctor {
             attributes docinfo: 'shared'
             baseDirFollowsSourceDir()

diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy
@@ -56,6 +56,7 @@ import static org.asciidoctor.gradle.base.internal.ConfigurationUtils.asConfigur
 import static org.gradle.api.tasks.PathSensitivity.RELATIVE
 import static org.gradle.workers.IsolationMode.CLASSLOADER
 import static org.gradle.workers.IsolationMode.PROCESS
+import static org.ysb33r.grolifant.api.core.LegacyLevel.PRE_6_4
 
 /** Base class for all AsciidoctorJ tasks.
  *
@@ -584,7 +585,7 @@ class AbstractAsciidoctorTask extends AbstractAsciidoctorBaseTask {
                 configureForkOptions(jes)
                 logger.debug "Running AsciidoctorJ instance with environment: ${jes.environment}"
                 jes.with {
-                    setExecClass(jes, AsciidoctorJavaExec.canonicalName, project.gradle.gradleVersion)
+                    setExecClass(jes, AsciidoctorJavaExec.canonicalName)
                     classpath = javaExecClasspath
                     args execConfigurationData.absolutePath
                 }
@@ -606,11 +607,11 @@ class AbstractAsciidoctorTask extends AbstractAsciidoctorBaseTask {
      * the mainClass property that was added in 6.4.
      */
     @CompileDynamic
-    private void setExecClass(JavaExecSpec jes, String execClass, String gradleVersion) {
-        if (gradleVersion >= GradleVersion.version(('6.4'))) {
-            jes.mainClass = execClass
-        } else {
+    private void setExecClass(JavaExecSpec jes, String execClass) {
+        if (PRE_6_4) {
             jes.main = execClass
+        } else {
+            jes.mainClass = execClass
         }
     }
 

diff --git a/jvm/src/test/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskSpec.groovy b/jvm/src/test/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskSpec.groovy
@@ -15,7 +15,6 @@
  */
 package org.asciidoctor.gradle.jvm
 
-
 import org.asciidoctor.gradle.internal.ExecutorConfiguration
 import org.gradle.api.Action
 import org.gradle.api.GradleException
@@ -509,8 +508,6 @@ class AsciidoctorTaskSpec extends Specification {
     AsciidoctorTask asciidoctorTask(Closure cfg) {
         project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask).configure cfg
     }
-
-
 }
 
 class ExecutorConfigurationInspectingAsciidoctorTask extends AsciidoctorTask {