Fix published jars for non-shadowed packages

(cherry picked from commit 6b49fc1)
partiql · Jul 10, 2024 · 415ca1b · 415ca1b
1 parent 5b86afc
commit 415ca1b
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 0 deletions.
diff --git a/partiql-ast/build.gradle.kts b/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"

diff --git a/partiql-coverage/build.gradle.kts b/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>() {

diff --git a/partiql-plan/build.gradle.kts b/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

diff --git a/partiql-planner/build.gradle.kts b/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 {

diff --git a/partiql-spi/build.gradle.kts b/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"

diff --git a/partiql-types/build.gradle.kts b/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"