Fixes build failure

partiql · Nov 5, 2024 · ac4c448 · ac4c448
1 parent 832476f
commit ac4c448
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
@@ -28,15 +28,9 @@ dependencies {
     annotationProcessor(Deps.lombok)
 }
 
-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()
-    }
+// TODO: Figure out why this is needed.
+tasks.withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 tasks.shadowJar {

diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
@@ -47,6 +47,11 @@ tasks.shadowJar {
     configurations = listOf(project.configurations.shadow.get())
 }
 
+// TODO: Figure out why this is needed.
+tasks.withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 // Workaround for https://github.com/johnrengelman/shadow/issues/651
 components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
     c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {