From 64c2e7b384476f237e7e780a5fe32881c728efcf Mon Sep 17 00:00:00 2001 From: Niels Pardon Date: Thu, 27 Feb 2025 15:31:23 +0100 Subject: [PATCH] feat: correctly declare api dependencies Signed-off-by: Niels Pardon --- core/build.gradle.kts | 4 ++-- isthmus/build.gradle.kts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 0b3c6d308..a7371816c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,7 +2,7 @@ import org.gradle.plugins.ide.idea.model.IdeaModel plugins { `maven-publish` - id("java") + id("java-library") id("idea") id("antlr") id("com.google.protobuf") version "0.9.4" @@ -84,7 +84,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:${JUNIT_VERSION}") testImplementation("org.junit.jupiter:junit-jupiter-params:${JUNIT_VERSION}") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${JUNIT_VERSION}") - implementation("com.google.protobuf:protobuf-java:${PROTOBUF_VERSION}") + api("com.google.protobuf:protobuf-java:${PROTOBUF_VERSION}") implementation("com.fasterxml.jackson.core:jackson-databind:${JACKSON_VERSION}") implementation("com.fasterxml.jackson.core:jackson-annotations:${JACKSON_VERSION}") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${JACKSON_VERSION}") diff --git a/isthmus/build.gradle.kts b/isthmus/build.gradle.kts index 09ac023e6..fab647287 100644 --- a/isthmus/build.gradle.kts +++ b/isthmus/build.gradle.kts @@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { `maven-publish` - id("java") + id("java-library") id("idea") id("com.diffplug.spotless") version "6.19.0" id("com.github.johnrengelman.shadow") version "8.1.1" @@ -79,8 +79,8 @@ val SLF4J_VERSION = properties.get("slf4j.version") val PROTOBUF_VERSION = properties.get("protobuf.version") dependencies { - implementation(project(":core")) - implementation("org.apache.calcite:calcite-core:${CALCITE_VERSION}") + api(project(":core")) + api("org.apache.calcite:calcite-core:${CALCITE_VERSION}") // calcite-core 1.37.0 brings in net.minidev:json-smart:2.5.0 which has a CVE associated with it. // See: https://osv.dev/vulnerability/GHSA-pq2g-wx69-c263 // This causes the build to fail. Pull in the fixed version until Calcite is updated