Cherry picks #1504 (Fix published jars for non-shadowed packages) (#1505

))

* Fix published jars for non-shadowed packages

(cherry picked from commit 6b49fc1)

* Apply patch for partiql-eval

partiql-ast/build.gradle.kts

@@ -25,6 +25,17 @@ dependencies {
     api(project(":partiql-types"))
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 publish {
     artifactId = "partiql-ast"
     name = "PartiQL AST"

partiql-coverage/build.gradle.kts

@@ -28,6 +28,17 @@ dependencies {
     implementation(Deps.jgenhtml)
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 // Need to add this as we have both Java and Kotlin sources. Dokka already handles multi-language projects. If
 // Javadoc is enabled, we end up overwriting index.html (causing compilation errors).
 tasks.withType<Javadoc>() {

partiql-eval/build.gradle.kts

@@ -43,6 +43,17 @@ kotlin {
     explicitApi = null
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 // Need to add this as we have both Java and Kotlin sources. Dokka already handles multi-language projects. If
 // Javadoc is enabled, we end up overwriting index.html (causing compilation errors).
 tasks.withType<Javadoc>() {

partiql-plan/build.gradle.kts

@@ -26,6 +26,17 @@ dependencies {
     implementation(Deps.kotlinReflect)
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 // Disabled for partiql-plan project.
 kotlin {
     explicitApi = null

partiql-planner/build.gradle.kts

@@ -38,6 +38,17 @@ dependencies {
     testFixturesImplementation(project(":partiql-spi"))
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 tasks.register("generateResourcePath") {
     dependsOn("processTestFixturesResources")
     doLast {

partiql-spi/build.gradle.kts

@@ -24,6 +24,17 @@ dependencies {
     testImplementation(Deps.kasechange)
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 publish {
     artifactId = "partiql-spi"
     name = "PartiQL SPI"

partiql-types/build.gradle.kts

@@ -23,6 +23,17 @@ dependencies {
     implementation(Deps.kotlinxCollections)
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
 publish {
     artifactId = "partiql-types"
     name = "PartiQL Types"