Merge pull request #252 from zero88/feature/separate-jooqx-on-jvm-via…

…-version-build-variant Append jvm variant as build version to support multiple java versions
zero88 · Jun 22, 2024 · f2f597b · f2f597b
2 parents 426587e + 28aa6dc
commit f2f597b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/.github/workflows/jooqx.yml b/.github/workflows/jooqx.yml
@@ -91,7 +91,7 @@ jobs:
         os: [ 'ubuntu-latest' ]
     with:
       profile: 'jooqx'
-      version: ${{ matrix.java == '17' && needs.context.outputs.version || format('{0}-jvm8', needs.context.outputs.version) }}
+      version: ${{ needs.context.outputs.version }}
       semanticVersion: ${{ needs.context.outputs.semanticVersion }}
       hashVersion: ${{ needs.context.outputs.commitId }}
       isRelease: ${{ needs.context.outputs.isRelease }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -71,13 +71,20 @@ subprojects {
             }
         }
     }
-    val artifactClassifier = when (jvmRuntime) {
-        "8"  -> if (jvmRelease == "8") "" else "-jvm8"
-        "11" -> if (jvmRelease == "11") "" else "-jvm11"
-        "17" -> if (jvmRelease == "17") "" else "-jvm17"
-        "21" -> if (jvmRelease == "21") "" else "-jvm21"
+
+    val buildVersion = when (jvmRuntime) {
+        "8"  -> if (jvmRelease == "8") "" else "+jvm8"
+        "11" -> if (jvmRelease == "11") "" else "+jvm11"
+        "17" -> if (jvmRelease == "17") "" else "+jvm17"
+        "21" -> if (jvmRelease == "21") "" else "+jvm21"
         else -> throw IllegalArgumentException("Unknown version $jvmRuntime")
     }
+    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)
+    }
 
     dependencies {
         compileOnly(rootProject.libs.jetbrainsAnnotations)
@@ -105,17 +112,6 @@ subprojects {
         withType<AbstractPublishToMaven> {
             enabled = project != rootProject && project.path !in skipPublish
         }
-
-        withType<Jar> {
-            archiveClassifier.set(
-                when (name) {
-                    "testFixturesJar" -> "test-fixtures$artifactClassifier"
-                    "javadocJar"      -> "javadoc$artifactClassifier"
-                    "sourcesJar"      -> "sources$artifactClassifier"
-                    else              -> artifactClassifier.replace("-", "")
-                }
-            )
-        }
     }
 }
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -103,13 +103,4 @@ tasks {
         title = "jOOQx Testing ${project.version} API"
     }
 
-    withType<Jar> {
-        // need to override in here, since at root project, test-fixtures is not yet recognized
-        if (name == "testFixturesJar") {
-            when (JavaVersion.current().majorVersion) {
-                "8" -> archiveClassifier.set("test-fixtures-jvm8")
-                "11" -> archiveClassifier.set("test-fixtures-jvm11")
-            }
-        }
-    }
 }