Commit 1e4f1301 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.3.x' into 2.4.x

Closes gh-25895
parents 8a045474 76f74482
...@@ -136,6 +136,7 @@ class AsciidoctorConventions { ...@@ -136,6 +136,7 @@ class AsciidoctorConventions {
syncDocumentationSource.setDestinationDir(syncedSource); syncDocumentationSource.setDestinationDir(syncedSource);
syncDocumentationSource.from("src/docs/"); syncDocumentationSource.from("src/docs/");
asciidoctorTask.dependsOn(syncDocumentationSource); asciidoctorTask.dependsOn(syncDocumentationSource);
asciidoctorTask.getInputs().dir(syncedSource);
asciidoctorTask.setSourceDir(project.relativePath(new File(syncedSource, "asciidoc/"))); asciidoctorTask.setSourceDir(project.relativePath(new File(syncedSource, "asciidoc/")));
return syncDocumentationSource; return syncDocumentationSource;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment