fix: guide task dependencies on javadoc copy task

README.md

@@ -11,7 +11,12 @@ Tablesaw
 
 #### Data processing & transformation
 
-Import and export data from different sources: RDBMS, Excel, CSV, TSV, JSON, HTML, Fixed Width text files. Combine tables by appending or joining. Add and remove columns or rows. Sort, Group, Filter, Edit, Transpose, etc. Map/Reduce operations. Handle missing values.
+- Import and export data: RDBMS, Excel, CSV, TSV, JSON, HTML, Fixed Width text files.
+- Combine tables by appending or joining. 
+- Add and remove columns or rows.
+- Sort, Group, Filter, Edit, Transpose, etc. 
+- Map/Reduce operations.
+- Handle missing values.
 
 #### Statistics
 
@@ -24,27 +29,27 @@ Tablesaw supports data visualization by providing a wrapper for the Plot.ly Java
 
 <table>
   <tr>
-    <td><img src="docs/guide/src/docs/images/eda/box1.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/scatter_2_Yaxes.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/tornado.scatter.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/bush_time_series2.png" alt="chart" width="230" height="150" /></td> 
+    <td><img src="docs/guide/src/docs/resources/images/eda/box1.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/scatter_2_Yaxes.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/tornado.scatter.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/bush_time_series2.png" alt="chart" width="230" height="150" /></td> 
   </tr>
   <tr>
-    <td><img src="docs/guide/src/docs/images/eda/hist_overlay.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/histogram2.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/histogram2d.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/pie.png" alt="chart" width="230" height="150" /></td> 
+    <td><img src="docs/guide/src/docs/resources/images/eda/hist_overlay.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/histogram2.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/histogram2d.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/pie.png" alt="chart" width="230" height="150" /></td> 
   </tr>
   <tr>
-    <td><img src="docs/guide/src/docs/images/eda/wine_bubble_3d.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/wine_bubble_with_groups.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/robberies_area.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/ml/regression/wins%20by%20year.png" alt="chart" width="230" height="150" /></td> 
+    <td><img src="docs/guide/src/docs/resources/images/eda/wine_bubble_3d.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/wine_bubble_with_groups.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/robberies_area.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/ml/regression/wins%20by%20year.png" alt="chart" width="230" height="150" /></td> 
   </tr>
   <tr>
-    <td><img src="docs/guide/src/docs/images/eda/bush_heatmap1.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/tornado_bar_groups.png" alt="chart" width="230" height="150" /></td>
-    <td><img src="docs/guide/src/docs/images/eda/ohlc1.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/bush_heatmap1.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/tornado_bar_groups.png" alt="chart" width="230" height="150" /></td>
+    <td><img src="docs/guide/src/docs/resources/images/eda/ohlc1.png" alt="chart" width="230" height="150" /></td>
     <td></td> 
   </tr>
 </table>

build.gradle

@@ -145,4 +145,13 @@ allprojects {
         targetCompatibility = findProperty('targetCompatibility')
         options.encoding    = 'UTF-8'
     }
-}
+
+    // TODO: report to Kordamp javadoc aggregation output conflicts with createGuide
+    tasks.withType(Copy).configureEach {
+        if (it.name == 'aggregateCopyDocFiles') {
+            it.mustRunAfter(project(":guide")
+                .tasks
+                .named('createGuide'))
+        }
+    }
+}

docs/guide/guide.gradle

@@ -1,73 +1,29 @@
 plugins {
     id('org.kordamp.gradle.guide')
-    id('org.asciidoctor.jvm.convert')
-}
-
-tasks.register('generateJavadoc') {
-    dependsOn(
-        ':tablesaw-arrow:javadoc',
-        ':tablesaw-beakerx:javadoc',
-        ':tablesaw-core:javadoc',
-        ':tablesaw-excel:javadoc',
-        ':tablesaw-html:javadoc',
-        ':tablesaw-json:javadoc',
-        ':tablesaw-jsplot:javadoc',
-        ':tablesaw-saw:javadoc',
-    )
-}
-
-tasks.register('generateJavadocAggregation') {
-    dependsOn(project.rootProject
-        .getTasksByName('aggregateJavadoc', false)
-        .find()
-        .mustRunAfter(':guide:generateJavadoc'))
-}
-
-tasks.register("generateDocumentation") {
-    dependsOn('generateJavadocAggregation', asciidoctor)
-
-    doLast {
-        copy {
-            from "$rootDir/build/docs/aggregate-javadoc"
-            into "$buildDir/site/api/"
-        }
-        copy {
-            from "src/docs/site"
-            into "$buildDir/site"
-        }
-    }
+    id('org.ajoberstar.git-publish')
 }
 
 tasks.register("setAuthentication") {
     doLast {
-        System.setProperty("org.ajoberstar.grgit.auth.username", "${findProperty('PUBLISH_GH_TOKEN')}")
+        System.setProperty("org.ajoberstar.grgit.auth.username", findProperty('PUBLISH_GH_TOKEN').toString())
     }
 }
 
 gitPublishPush {
     dependsOn 'setAuthentication'
-    dependsOn 'generateDocumentation'
 }
 
 asciidoctor {
     baseDirFollowsSourceDir()
-    outputDir layout.buildDirectory.dir("site").get()
     attributes(
-            'tablesaw': version,
-            'github': '.',
-            'toc': 'left',
-            'source-highlighter': 'rouge'
-    )
-    resources {
-        from('src/docs/images') {
-            include '**/*'
-        }
-        into './images'
-    }
+        'tablesaw': version,
+        'github': '.',
+        'toc': 'left',
+        'source-highlighter': 'rouge')
 }
 
 asciidoctorj {
     modules {
         diagram.version '2.1.0'
     }
-}
+}

settings.gradle

@@ -18,10 +18,4 @@ apply plugin: 'org.kordamp.gradle.settings'
 
 projects {
     directories = ['docs', 'modules', 'samples']
-
-    plugins {
-        path(':guide') {
-            id 'org.ajoberstar.git-publish'
-        }
-    }
 }