doc(jooqx): update core-usage.adoc

zero88 · Jun 27, 2024 · 45075a3 · 45075a3
1 parent 0dff504
commit 45075a3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -1,7 +1,7 @@
 base=CHANGELOG.md
 breaking-labels=breaking-changes
 bug-labels=T: Bug
-exclude-tags-regex=(jpa|rsql|docs\/.+)\/v.+
+exclude-tags-regex=(jpa|rsql|(docs\/.+))\/v.+
 exclude-labels=R: Duplicate,R: Invalid,R: Wontfix,T: Question,!release-note,Project: jpa,Project: rsql
 enhancement-labels=T: Improvement,T: Feature
 exclude-tags=v2.0.0-rc2,v2.0.0-rc2+2
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,6 +14,7 @@ plugins {
     alias(libs.plugins.codegen) apply false
     alias(libs.plugins.docgen) apply false
     alias(libs.plugins.jooq) apply false
+    alias(libs.plugins.shadow) apply false
 }
 
 project.ext.set("baseName", "jooqx")
@@ -71,7 +72,6 @@ subprojects {
             }
         }
     }
-
     val buildVersion = when (jvmRuntime) {
         "8"  -> if (jvmRelease == "8") "" else "+jvm8"
         "11" -> if (jvmRelease == "11") "" else "+jvm11"
@@ -82,8 +82,7 @@ subprojects {
     val semanticVersion = prop(project, "semanticVersion", "")
     version = when (semanticVersion) {
         "-SNAPSHOT" -> project.version.toString().replace(semanticVersion, buildVersion + semanticVersion)
-        ""          -> project.version.toString() + buildVersion
-        else        -> project.version.toString().replace(semanticVersion, semanticVersion + buildVersion)
+        else        -> "${project.version}$buildVersion"
     }
 
     dependencies {

diff --git a/docs/asciidoc/src/antora/pages/core-usage.adoc b/docs/asciidoc/src/antora/pages/core-usage.adoc
@@ -58,19 +58,19 @@ The table below describe `jooq.x` compatibility with several integrations.
 |Java |jOOQ |Vert.x |jooq.x
 
 |`8`
-|`<= 3.14.16`
+|`\<= 3.14.16`
 |`^4.2`
-|{jooqx-version}-jvm8
+|{jooqx-jvm8-artifact}
 
 |`11`
-|`<= 3.16.23`
+|`\<= 3.16.23`
 |`^4.2`
-|{jooqx-version}-jvm8
+|{jooqx-jvm8-artifact}
 
 |`17`
 |`~3.17.0`
 |`^4.2`
-|{jooqx-version}-jvm8
+|{jooqx-jvm8-artifact}
 
 |`17`
 |`^3.18`

diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
@@ -1,3 +1,5 @@
+import cloud.playio.gradle.shared.prop
+
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.antora)
@@ -10,11 +12,18 @@ subprojects {
     }
 }
 
+val semanticVersion = prop(project, "semanticVersion", "")
+val jvm8Version = when (semanticVersion) {
+    "-SNAPSHOT" -> project.version.toString().replace(semanticVersion, "+jvm8$semanticVersion")
+    else        -> "${project.version}+jvm8"
+}
+
 documentation {
     antora {
         asciiAttributes.set(
             mapOf(
                 "jooqx-version" to project.version,
+                "jooqx-jvm8-artifact" to jvm8Version,
                 "jooq-version" to libs.jooq.get().version,
                 "vertx-version" to libs.vertxCore.get().version,
                 "mutiny-version" to libs.mutinyCore.get().version,