Fix build; remove redundant dep

partiql · May 10, 2024 · f748062 · f748062
1 parent 987b083
commit f748062
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 19 deletions.
diff --git a/buildSrc/src/main/kotlin/org/partiql/gradle/plugin/publish/PublishPlugin.kt b/buildSrc/src/main/kotlin/org/partiql/gradle/plugin/publish/PublishPlugin.kt
@@ -94,8 +94,8 @@ abstract class PublishPlugin : Plugin<Project> {
         }
 
         tasks.getByName<Jar>("jar") {
-            // Do not create the normal `jar`; use the generated shadow jar instead
-            enabled = false
+            // Rename jar for `project` dependencies; not published to Maven
+            archiveClassifier.set("original")
         }
 
         // Setup Maven Central Publishing

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -24,7 +24,6 @@ application {
 
 dependencies {
     implementation(project(":partiql-lang"))
-    implementation(project(":partiql-types"))
     implementation(Deps.kotlinxCoroutines)
     implementation(Deps.kotlinxCoroutinesJdk8)
     implementation(Deps.awsSdkS3)

diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 dependencies {
     api(Deps.pigRuntime)
     api(Deps.ionElement)
-    api(project(":partiql-types", configuration = "shadow"))
+    api(project(":partiql-types"))
 }
 
 publish {

diff --git a/partiql-cli/build.gradle.kts b/partiql-cli/build.gradle.kts
@@ -20,13 +20,7 @@ plugins {
 
 dependencies {
     implementation(project(":partiql-lang"))
-    implementation(project(":partiql-ast"))
-    implementation(project(":partiql-parser"))
-    implementation(project(":partiql-plan"))
-    implementation(project(":partiql-planner"))
-    implementation(project(":partiql-types"))
     implementation(project(":plugins:partiql-local"))
-    implementation(project(":partiql-spi"))
     implementation(Deps.csv)
     implementation(Deps.awsSdkBom)
     implementation(Deps.awsSdkDynamodb)

diff --git a/partiql-coverage/build.gradle.kts b/partiql-coverage/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":partiql-lang", configuration = "shadow"))
+    api(project(":partiql-lang"))
     implementation(Deps.junitApi)
     implementation(Deps.junitParams)
     implementation(Deps.junitPlatformLauncher)

diff --git a/partiql-parser/build.gradle.kts b/partiql-parser/build.gradle.kts
@@ -20,8 +20,8 @@ plugins {
 
 dependencies {
     antlr(Deps.antlr)
-    api(project(":partiql-ast", configuration = "shadow"))
-    api(project(":partiql-types", configuration = "shadow"))
+    api(project(":partiql-ast"))
+    api(project(":partiql-types"))
     implementation(Deps.ionElement)
     shadow(Deps.antlrRuntime)
 }

diff --git a/partiql-plan/build.gradle.kts b/partiql-plan/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":partiql-types", configuration = "shadow"))
+    api(project(":partiql-types"))
     implementation(Deps.ionElement)
     implementation(Deps.kotlinReflect)
 }

diff --git a/partiql-planner/build.gradle.kts b/partiql-planner/build.gradle.kts
@@ -24,10 +24,10 @@ plugins {
 }
 
 dependencies {
-    api(project(":partiql-plan", configuration = "shadow"))
-    api(project(":partiql-types", configuration = "shadow"))
-    implementation(project(":partiql-ast", configuration = "shadow"))
-    implementation(project(":partiql-spi", configuration = "shadow"))
+    api(project(":partiql-plan"))
+    api(project(":partiql-types"))
+    implementation(project(":partiql-ast"))
+    implementation(project(":partiql-spi"))
     implementation(Deps.dotlin)
     implementation(Deps.ionElement)
     // Test

diff --git a/partiql-spi/build.gradle.kts b/partiql-spi/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 
 dependencies {
     api(Deps.ionElement)
-    api(project(":partiql-types", configuration = "shadow"))
+    api(project(":partiql-types"))
 }
 
 publish {