Skip to content

Commit

Permalink
Add partiql-planner and partiql-parser Maven publishing plugin v0.12.1 (
Browse files Browse the repository at this point in the history
#1216)

Co-authored-by: John Ed Quinn <[email protected]>
  • Loading branch information
alancai98 and johnedquinn authored Sep 20, 2023
1 parent e256776 commit 21eda2e
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 27 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ Thank you to all who have contributed!
-->

## [0.12.1] - 2023-09-19

### Fixed
- Fixes build failure for version `0.12.0` by publishing `partiql-plan` and `partiql-parser` as independent artifacts. Please note that `partiql-plan` and `partiql-parser` are experimental.

### Contributors
Thank you to all who have contributed!
- @alancai98

## [0.12.0] - 2023-06-14

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0` |
| `org.partiql` | `partiql-lang-kotlin` | `0.12.1` |


For Maven builds, add the following to your `pom.xml`:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.partiql
version=0.12.0
version=0.12.1

ossrhUsername=EMPTY
ossrhPassword=EMPTY
Expand Down
21 changes: 2 additions & 19 deletions partiql-lang/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ plugins {
id(Plugins.publish)
}

val libs: Configuration by configurations.creating

configurations {
api.get().extendsFrom(libs)
}

// Disabled for partiql-lang project.
kotlin {
explicitApi = null
Expand All @@ -35,12 +29,11 @@ dependencies {
api(project(":partiql-ast"))
api(project(":partiql-spi"))
api(project(":partiql-types"))
api(project(":partiql-plan"))
api(project(":partiql-parser"))
api(Deps.ionElement)
api(Deps.ionJava)
api(Deps.ionSchema)
// libs are included in partiql-lang-kotlin JAR, but are not published independently yet.
libs(project(":partiql-parser"))
libs(project(":partiql-plan"))
implementation(Deps.antlrRuntime)
implementation(Deps.csv)
implementation(Deps.kotlinReflect)
Expand Down Expand Up @@ -79,13 +72,3 @@ tasks.processResources {
include("partiql.ion")
}
}

tasks.jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
// adds all `libs(project(...))` to the partiql-lang-kotlin jar
from(
libs.dependencies.filterIsInstance<ProjectDependency>().map {
it.dependencyProject.sourceSets.main.get().output.classesDirs
}
)
}
12 changes: 6 additions & 6 deletions partiql-parser/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
plugins {
id(Plugins.antlr)
id(Plugins.conventions)
// id(Plugins.publish)
id(Plugins.publish)
}

dependencies {
Expand Down Expand Up @@ -51,8 +51,8 @@ tasks.processResources {
}
}

// publish {
// artifactId = "partiql-parser"
// name = "PartiQL Parser"
// description = "PartiQL's Parser"
// }
publish {
artifactId = "partiql-parser"
name = "PartiQL Parser"
description = "PartiQL's experimental Parser"
}
12 changes: 12 additions & 0 deletions partiql-plan/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

plugins {
id(Plugins.conventions)
id(Plugins.publish)
id(Plugins.library)
}

Expand All @@ -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<Exec>("generate") {
dependsOn(":lib:sprout:install")
workingDir(projectDir)
Expand Down

0 comments on commit 21eda2e

Please sign in to comment.