From 32212262484d4abf6565e8b0426ef0946abccc1b Mon Sep 17 00:00:00 2001 From: "R. C. Howell" Date: Wed, 2 Oct 2024 13:54:22 -0700 Subject: [PATCH] Prepares 1.0.0-rc.1 release (#1606) --- CHANGELOG.md | 17 +++++++++++++++++ README.md | 2 +- gradle.properties | 2 +- partiql-parser/build.gradle.kts | 3 ++- partiql-spi/build.gradle.kts | 1 + partiql-types/build.gradle.kts | 10 ++++++++++ 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 989436c8ed..728c3f4d0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Thank you to all who have contributed! --> +## [1.0.0-rc.1] + +### Added + +### Changed + +### Deprecated + +### Fixed + +### Removed + +### Security + +### Contributors +Thank you to all who have contributed! + ## [0.14.8] ### Added diff --git a/README.md b/README.md index 600935af0b..27e61e87a5 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.14.8` | +| `org.partiql` | `partiql-lang-kotlin` | `1.0.0-rc.1` | For Maven builds, add the following to your `pom.xml`: diff --git a/gradle.properties b/gradle.properties index 6beaa088e1..bc91051bc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.partiql -version=1.0.0-SNAPSHOT +version=1.0.0-rc.1 ossrhUsername=EMPTY ossrhPassword=EMPTY diff --git a/partiql-parser/build.gradle.kts b/partiql-parser/build.gradle.kts index 486796695d..ffe0e46254 100644 --- a/partiql-parser/build.gradle.kts +++ b/partiql-parser/build.gradle.kts @@ -76,6 +76,7 @@ tasks.compileTestKotlin { tasks.withType().configureEach { // ensure "generateGrammarSource" is called before "sourcesJar". dependsOn(tasks.withType()) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } tasks.withType().configureEach { @@ -97,7 +98,7 @@ tasks.processResources { publish { artifactId = "partiql-parser" name = "PartiQL Parser" - description = "PartiQL's experimental Parser" + description = "PartiQL's Parser" // `antlr` dependency configuration adds the ANTLR API configuration (and Maven `compile` dependency scope on // publish). It's a known issue w/ the ANTLR gradle plugin. Follow https://github.com/gradle/gradle/issues/820 // for context. In the maven publishing step, any API or IMPLEMENTATION dependencies w/ "antlr4" non-runtime diff --git a/partiql-spi/build.gradle.kts b/partiql-spi/build.gradle.kts index fa920a7041..b947df432b 100644 --- a/partiql-spi/build.gradle.kts +++ b/partiql-spi/build.gradle.kts @@ -41,6 +41,7 @@ components.withType(AdhocComponentWithVariants::class.java).forEach { c -> tasks.withType { enabled = false } + tasks.withType { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/partiql-types/build.gradle.kts b/partiql-types/build.gradle.kts index 018dded2f0..57f7051901 100644 --- a/partiql-types/build.gradle.kts +++ b/partiql-types/build.gradle.kts @@ -33,6 +33,16 @@ components.withType(AdhocComponentWithVariants::class.java).forEach { c -> } } +// Need to add this as we have both Java and Kotlin sources. Dokka already handles multi-language projects. If +// Javadoc is enabled, we end up overwriting index.html (causing compilation errors). +tasks.withType { + enabled = false +} + +tasks.withType { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + tasks.shadowJar { configurations = listOf(project.configurations.shadow.get()) }