Remove use of path-sensitity on outputs (asciidoctor#484)

ysb33r · Jan 8, 2020 · 78259f5 · 78259f5
1 parent 873d374
commit 78259f5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy
@@ -133,7 +133,6 @@ abstract class AbstractAsciidoctorBaseTask extends DefaultTask {
      *
      */
     @OutputDirectory
-    @PathSensitive(PathSensitivity.NAME_ONLY)
     File getOutputDir() {
         this.outDir.asFile.get()
     }
@@ -528,7 +527,6 @@ abstract class AbstractAsciidoctorBaseTask extends DefaultTask {
      * @since 1.5.1
      */
     @OutputDirectories
-    @PathSensitive(RELATIVE)
     Set<File> getBackendOutputDirectories() {
         if (languages.empty) {
             Transform.toSet(configuredOutputOptions.backends) {

diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc
@@ -15,8 +15,6 @@ include::parts/compatibility.adoc[]
 
 include::parts/quick-start.adoc[]
 
-include::parts/common-task-configuration.adoc[]
-
 include::parts/asciidoctorj-base-plugin.adoc[]
 
 include::parts/asciidoctorj-plugin.adoc[]
@@ -29,6 +27,8 @@ include::parts/asciidoctorj-revealjs-plugin.adoc[]
 
 include::parts/asciidoctorj-leanpub-plugin.adoc[]
 
+include::parts/asciidoctorj-common-task-configuration.adoc[]
+
 include::parts/asciidoctor-diagram.adoc[]
 
 include::parts/asciidoctorj-gems-plugin.adoc[]

diff --git a/...idoc/parts/common-task-configuration.adoc → ...ciidoctorj-common-task-configuration.adoc b/...idoc/parts/common-task-configuration.adoc → ...ciidoctorj-common-task-configuration.adoc
@@ -1,6 +1,6 @@
 == Task Configuration
 
-All Asciidoctor tasks will have the following methods and properties:
+All AsciidoctorJ tasks will have the following methods and properties:
 
 .Properties and methods common all {asciidoctorj-name} tasks
 [horizontal]
@@ -28,9 +28,8 @@ outputDir:: where generated docs go.
   Default: `$buildDir/asciidoc`.
 parallelMode:: Specifies whether each backend or other variant of a converting tasks huodl be run in parallel or sequential.
   Sequential conversions might have less initialisation overhead, but may suffer from `gemPath` and extension pollution. Default: `true` (parallel).
-resources:: specify which additional files (image etc.) must be copied to output directory using a
-  http://www.gradle.org/docs/current/javadoc/org/gradle/api/file/CopySpec.html[CopySpec].
-secondarySources: Specify which source files should be monitor for change. These are typically files which are included by top-level files as well as doctype files.
+resources:: specify which additional files (image etc.) must be copied to output directory using a http://www.gradle.org/docs/current/javadoc/org/gradle/api/file/CopySpec.html[CopySpec].
+secondarySources:: Specify which source files should be monitor for change. These are typically files which are included by top-level files as well as doctype files.
   Default: All files in sourceDir which matches `getDefaultSourceDocumentPattern()` as well as doctype files.
 sourceDir:: where the asciidoc sources are.
   Use either `sourceDir path`, `setSourceDir path` or `sourceDir=path`

diff --git a/jvm-pdf/src/main/groovy/org/asciidoctor/gradle/jvm/pdf/AsciidoctorPdfTask.groovy b/jvm-pdf/src/main/groovy/org/asciidoctor/gradle/jvm/pdf/AsciidoctorPdfTask.groovy
@@ -97,6 +97,8 @@ class AsciidoctorPdfTask extends AbstractAsciidoctorTask {
      * @return Theme name or {@code null} if no theme was set.
      */
     @SuppressWarnings('LineLength')
+    @Input
+    @Optional
     String getThemeName() {
         themeDescriptor?.themeName
     }

diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy
@@ -69,7 +69,6 @@ class AbstractAsciidoctorTask extends AbstractAsciidoctorBaseTask {
     public final static ProcessMode OUT_OF_PROCESS = ProcessMode.OUT_OF_PROCESS
     public final static ProcessMode JAVA_EXEC = ProcessMode.JAVA_EXEC
 
-    @Internal
     protected final static GradleVersion LAST_GRADLE_WITH_CLASSPATH_LEAKAGE = GradleVersion.version(('5.99'))
 
     protected final AsciidoctorJExtension asciidoctorj

diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJBasePlugin.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AsciidoctorJBasePlugin.groovy
@@ -40,6 +40,10 @@ class AsciidoctorJBasePlugin implements Plugin<Project> {
                 AsciidoctorJExtension,
                 project
             )
+
+            tasks.all {
+
+            }
         }
     }
 }
diff --git a/...t/src/main/groovy/org/asciidoctor/gradle/slides/export/base/AbstractExportBaseTask.groovy b/...t/src/main/groovy/org/asciidoctor/gradle/slides/export/base/AbstractExportBaseTask.groovy
@@ -127,7 +127,6 @@ abstract class AbstractExportBaseTask extends DefaultTask {
      * @return Outpur directory
      */
     @OutputDirectory
-    @PathSensitive(RELATIVE)
     File getOutputDir() {
         project.file(this.outputDir)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,10 @@ class AsciidoctorJBasePlugin implements Plugin<Project> { @@
                     AsciidoctorJExtension,
                     project
                 )
+                tasks.all {
+                }
             }
         }
     }