build: Restore separate jdbc-proto artifact for better visibility

Separates proto files from jdbc-grpc classifier artifact into a
dedicated jdbc-proto. This improves visibility and accessibility of
the proto files for consumers who need them without requiring the full
grpc implementation.

Author: jschneidereit

buildSrc/src/main/kotlin/hyper-conventions.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 val hyperApiVersion: String by project
-val hyperZipName = "hyper-$hyperApiVersion.zip"
+val hypzerZipPath = ".hyper/hyper-$hyperApiVersion.zip"
 
 tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadHyper") {
     group = "hyper"
@@ -18,7 +18,7 @@ tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadHyper") {
     val url = "$urlBase.$hyperApiVersion.zip"
 
     src(url)
-    dest(project.layout.buildDirectory.file(hyperZipName))
+    dest(project.layout.projectDirectory.file(hypzerZipPath))
     overwrite(false)
 }
 
@@ -29,7 +29,7 @@ tasks.register<Copy>("extractHyper") {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     includeEmptyDirs = false
 
-    from(zipTree(project.layout.buildDirectory.file(hyperZipName))) {
+    from(zipTree(project.layout.projectDirectory.file(hypzerZipPath))) {
         include("**/lib/hyper/hyperd")
         include("**/lib/hyper/hyperd.exe")
         include("**/lib/**/*.dylib")

buildSrc/src/main/kotlin/publishing-conventions.gradle.kts

@@ -61,7 +61,6 @@ publishing {
     publications {
         create<MavenPublication>("mavenJava") {
             from(components["java"])
-//            artifact(tasks())
         }
     }
     repositories {
@@ -129,6 +128,7 @@ fun MavenPublication.updateName() {
         "jdbc" -> "Salesforce Data Cloud JDBC Driver"
         "jdbc-core" -> "Salesforce Data Cloud JDBC Core"
         "jdbc-grpc" -> "Salesforce Data Cloud JDBC gRPC"
+        "jdbc-proto" -> "Salesforce Data Cloud JDBC Proto Files"
         else -> {
             logger.lifecycle("Unknown project, can't update name. artifactId=${this.artifactId}")
             null
@@ -146,6 +146,7 @@ fun MavenPublication.updateDescription() {
         "jdbc" -> "Salesforce Data Cloud JDBC driver"
         "jdbc-core" -> "Salesforce Data Cloud JDBC core implementation"
         "jdbc-grpc" -> "Salesforce Data Cloud Query v3 API gRPC stubs"
+        "jdbc-proto" -> "Salesforce Data Cloud Query API proto files"
         else -> {
             logger.lifecycle("Unknown project, can't update description. artifactId=${this.artifactId}")
             null

jdbc-core/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":jdbc-grpc"))
+    compileOnly(project(":jdbc-grpc"))
 
     implementation(libs.slf4j.api)
 
@@ -31,6 +31,7 @@ dependencies {
 
     runtimeOnly(libs.jjwt.jackson)
 
+    testImplementation(project(":jdbc-grpc"))
     testImplementation(platform(libs.junit.bom))
     testImplementation(libs.bundles.testing)
     testImplementation(libs.bundles.mocking)

jdbc-grpc/build.gradle.kts

@@ -38,25 +38,44 @@ tasks.withType<JavaCompile> {
 
 val protoJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
-    archiveClassifier.set("proto")
+    archiveBaseName.set("jdbc-proto")
     from(project.projectDir.resolve("src/main/proto"))
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 tasks.jar {
+    archiveBaseName.set("jdbc-grpc")
     val tasks = sourceSets.map { sourceSet ->
         from(sourceSet.output)
         sourceSet.getCompileTaskName("java")
     }.toTypedArray()
 
     dependsOn(protoJar, *tasks)
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+val emptySourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    archiveBaseName.set("jdbc-proto")
+}
+
+val emptyJavadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    archiveBaseName.set("jdbc-proto")
 }
 
 publishing {
     publications {
         named<MavenPublication>("mavenJava") {
+            artifactId = "jdbc-grpc"
+        }
+
+        create<MavenPublication>("mavenProto") {
+            artifactId = "jdbc-proto"
             artifact(protoJar)
+            artifact(emptySourcesJar)
+            artifact(emptyJavadocJar)
         }
     }
 }