diff --git a/CHANGELOG.md b/CHANGELOG.md index d814677dc8..6a22e98cdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## [0.11.1] - 2023-09-19 + +### Fixed +- Fixes build failure for version `0.11.0` by publishing `partiql-plan` as an independent artifact. Please note that `partiql-plan` is experimental. ## [0.11.0] - 2023-05-22 diff --git a/README.md b/README.md index 456a921106..cd476a9fde 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ This project is published to [Maven Central](https://search.maven.org/artifact/o | Group ID | Artifact ID | Recommended Version | |---------------|-----------------------|---------------------| -| `org.partiql` | `partiql-lang-kotlin` | `0.11.0` | +| `org.partiql` | `partiql-lang-kotlin` | `0.11.1` | For Maven builds, add the following to your `pom.xml`: diff --git a/gradle.properties b/gradle.properties index e80846e0dd..eb9fdb3468 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.partiql -version=0.11.0 +version=0.11.1 ossrhUsername=EMPTY ossrhPassword=EMPTY diff --git a/partiql-lang/build.gradle.kts b/partiql-lang/build.gradle.kts index c6c9940014..4ff9bfa2ac 100644 --- a/partiql-lang/build.gradle.kts +++ b/partiql-lang/build.gradle.kts @@ -22,12 +22,6 @@ plugins { id(Plugins.publish) } -val libs: Configuration by configurations.creating - -configurations { - api.get().extendsFrom(libs) -} - // Disabled for partiql-lang project. kotlin { explicitApi = null @@ -38,11 +32,10 @@ dependencies { api(project(":lib:isl")) api(project(":partiql-spi")) api(project(":partiql-types")) + api(project(":partiql-plan")) api(Deps.ionElement) api(Deps.ionJava) api(Deps.pigRuntime) - // libs are included in partiql-lang-kotlin JAR - libs(project(":partiql-plan")) implementation(Deps.antlrRuntime) implementation(Deps.csv) implementation(Deps.kotlinReflect) @@ -107,13 +100,3 @@ tasks.processResources { into("org/partiql/type-domains/") } } - -tasks.jar { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - // adds all `libs(project(...))` to the partiql-lang-kotlin jar - from( - libs.dependencies.filterIsInstance().map { - it.dependencyProject.sourceSets.main.get().output.classesDirs - } - ) -} diff --git a/partiql-plan/build.gradle.kts b/partiql-plan/build.gradle.kts index f61296b49f..225523735c 100644 --- a/partiql-plan/build.gradle.kts +++ b/partiql-plan/build.gradle.kts @@ -16,6 +16,7 @@ plugins { id(Plugins.conventions) + id(Plugins.publish) id(Plugins.library) } @@ -25,6 +26,17 @@ dependencies { implementation(Deps.kotlinReflect) } +// Disabled for partiql-plan project. +kotlin { + explicitApi = null +} + +publish { + artifactId = "partiql-plan" + name = "PartiQL Plan" + description = "PartiQL Plan experimental data structures" +} + val generate = tasks.register("generate") { dependsOn(":lib:sprout:install") workingDir(projectDir)