update to vodml plugin 0.5.4

also put in more flexible yq site nav integration option - it allows for the nav to be at any level
ivoa · Jul 22, 2024 · f3002bb · f3002bb
1 parent 70f8ef1
commit f3002bb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     // this plugin provides all the vo-dml functionality
-    id("net.ivoa.vo-dml.vodmltools") version "0.5.2"
+    id("net.ivoa.vo-dml.vodmltools") version "0.5.4"
 }
 
 vodml {
@@ -43,6 +43,8 @@ dependencies {
     testImplementation("org.javastro:jaxbjpa-utils:0.1.2:test")
 }
 
+
+// site tasks
 tasks.register<Copy>("copyJavaDocForSite") {
     from(layout.buildDirectory.dir("docs/javadoc"))
     into(vodml.outputSiteDir.dir("javadoc"))
@@ -52,7 +54,7 @@ tasks.register<Copy>("copyJavaDocForSite") {
 
 tasks.register<Exec>("makeSiteNav")
 {
-    commandLine("yq","eval",  "(.nav.[]|select(has(\"AutoGenerated Documentation\"))|.[\"AutoGenerated Documentation\"]) += load(\"allnav.yml\")", "mkdocs_template.yml")
+    commandLine("yq","eval",  "(.nav | .. | select(has(\"AutoGenerated Documentation\"))|.[\"AutoGenerated Documentation\"]) += (load(\"doc/site/generated/allnav.yml\")|sort_by(keys|.[0]))", "mkdocs_template.yml")
     standardOutput= file("mkdocs.yml").outputStream()
     dependsOn("vodmlSite")
     dependsOn("copyJavaDocForSite")