From d110acf27f9d249498fa5d5efeac70f2b1d23ab0 Mon Sep 17 00:00:00 2001 From: Valentyn Sobol Date: Tue, 24 Oct 2023 23:07:28 +0300 Subject: [PATCH] Fix release builds (#136) * Fix native artifact jar file name * Upgrade version to 0.5.11 --- README.md | 6 +++--- buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts | 2 +- docs/getting-started.md | 6 +++--- examples/build.gradle.kts | 6 +++--- ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts | 5 ++++- ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts | 5 ++++- ksmt-yices/ksmt-yices-native/build.gradle.kts | 5 ++++- ksmt-z3/ksmt-z3-native/build.gradle.kts | 5 ++++- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index db5a1d4db..e08eef8e9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Get the most out of SMT solving with KSMT features: * Streamlined [solver delivery](#ksmt-distribution) with no need for building a solver or implementing JVM bindings [![KSMT: build](https://github.com/UnitTestBot/ksmt/actions/workflows/build-and-run-tests.yml/badge.svg)](https://github.com/UnitTestBot/ksmt/actions/workflows/build-and-run-tests.yml) -[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.5.10) +[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.5.11) [![javadoc](https://javadoc.io/badge2/io.ksmt/ksmt-core/javadoc.svg)](https://javadoc.io/doc/io.ksmt/ksmt-core) ## Get started @@ -20,9 +20,9 @@ To start using KSMT, install it via [Gradle](https://gradle.org/): ```kotlin // core -implementation("io.ksmt:ksmt-core:0.5.10") +implementation("io.ksmt:ksmt-core:0.5.11") // z3 solver -implementation("io.ksmt:ksmt-z3:0.5.10") +implementation("io.ksmt:ksmt-z3:0.5.11") ``` Find basic instructions in the [Getting started](docs/getting-started.md) guide and try it out with the diff --git a/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts b/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts index ea4191eeb..8e81bb4b3 100644 --- a/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts +++ b/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "io.ksmt" -version = "0.5.10" +version = "0.5.11" repositories { mavenCentral() diff --git a/docs/getting-started.md b/docs/getting-started.md index 0319e4d2d..1c8a301a7 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -34,7 +34,7 @@ repositories { ```kotlin dependencies { // core - implementation("io.ksmt:ksmt-core:0.5.10") + implementation("io.ksmt:ksmt-core:0.5.11") } ``` @@ -43,9 +43,9 @@ dependencies { ```kotlin dependencies { // z3 - implementation("io.ksmt:ksmt-z3:0.5.10") + implementation("io.ksmt:ksmt-z3:0.5.11") // bitwuzla - implementation("io.ksmt:ksmt-bitwuzla:0.5.10") + implementation("io.ksmt:ksmt-bitwuzla:0.5.11") } ``` diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 68c07f90e..b29694e76 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -9,11 +9,11 @@ repositories { dependencies { // core - implementation("io.ksmt:ksmt-core:0.5.10") + implementation("io.ksmt:ksmt-core:0.5.11") // z3 solver - implementation("io.ksmt:ksmt-z3:0.5.10") + implementation("io.ksmt:ksmt-z3:0.5.11") // Runner and portfolio solver - implementation("io.ksmt:ksmt-runner:0.5.10") + implementation("io.ksmt:ksmt-runner:0.5.11") } java { diff --git a/ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts b/ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts index e96b537b0..9657013ab 100644 --- a/ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts +++ b/ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts @@ -39,21 +39,24 @@ dependencies { bitwuzlaBinaries.entries.forEach { (sourceSet, nativeConfig) -> val name = sourceSet.name + val artifactName = "ksmt-bitwuzla-native-$name" val systemArch = name.replace('-', '/') val jarTask = tasks.register("$name-jar") { + archiveBaseName.set(artifactName) from(sourceSet.output) copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/bitwuzla") } val sourcesJarTask = tasks.register("$name-sources-jar") { + archiveBaseName.set(artifactName) archiveClassifier.set("sources") from(sourceSet.allSource) } publishing.publications { register("maven-$name") { - artifactId = "ksmt-bitwuzla-native-$name" + artifactId = artifactName artifact(jarTask.get()) artifact(sourcesJarTask.get()) diff --git a/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts b/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts index d16075218..26c43bc6a 100644 --- a/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts +++ b/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts @@ -39,21 +39,24 @@ dependencies { cvc5Binaries.entries.forEach { (sourceSet, nativeConfig) -> val name = sourceSet.name + val artifactName = "ksmt-cvc5-native-$name" val systemArch = name.replace('-', '/') val jarTask = tasks.register("$name-jar") { + archiveBaseName.set(artifactName) from(sourceSet.output) copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/cvc5") } val sourcesJarTask = tasks.register("$name-sources-jar") { + archiveBaseName.set(artifactName) archiveClassifier.set("sources") from(sourceSet.allSource) } publishing.publications { register("maven-$name") { - artifactId = "ksmt-cvc5-native-$name" + artifactId = artifactName artifact(jarTask.get()) artifact(sourcesJarTask.get()) diff --git a/ksmt-yices/ksmt-yices-native/build.gradle.kts b/ksmt-yices/ksmt-yices-native/build.gradle.kts index 25a969dd3..d89c44d10 100644 --- a/ksmt-yices/ksmt-yices-native/build.gradle.kts +++ b/ksmt-yices/ksmt-yices-native/build.gradle.kts @@ -37,21 +37,24 @@ dependencies { yicesBinaries.entries.forEach { (sourceSet, nativeConfig) -> val name = sourceSet.name + val artifactName = "ksmt-yices-native-$name" val systemArch = name.replace('-', '/') val jarTask = tasks.register("$name-jar") { + archiveBaseName.set(artifactName) from(sourceSet.output) copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/yices") } val sourcesJarTask = tasks.register("$name-sources-jar") { + archiveBaseName.set(artifactName) archiveClassifier.set("sources") from(sourceSet.allSource) } publishing.publications { register("maven-$name") { - artifactId = "ksmt-yices-native-$name" + artifactId = artifactName artifact(jarTask.get()) artifact(sourcesJarTask.get()) diff --git a/ksmt-z3/ksmt-z3-native/build.gradle.kts b/ksmt-z3/ksmt-z3-native/build.gradle.kts index 379329a25..eb1895559 100644 --- a/ksmt-z3/ksmt-z3-native/build.gradle.kts +++ b/ksmt-z3/ksmt-z3-native/build.gradle.kts @@ -37,9 +37,11 @@ dependencies { z3Binaries.forEach { (sourceSet, z3BinaryTask, nativeConfig) -> val name = sourceSet.name + val artifactName = "ksmt-z3-native-$name" val systemArch = name.replace('-', '/') val jarTask = tasks.register("$name-jar") { + archiveBaseName.set(artifactName) from(sourceSet.output) z3BinaryTask?.let { @@ -53,13 +55,14 @@ z3Binaries.forEach { (sourceSet, z3BinaryTask, nativeConfig) -> } val sourcesJarTask = tasks.register("$name-sources-jar") { + archiveBaseName.set(artifactName) archiveClassifier.set("sources") from(sourceSet.allSource) } publishing.publications { register("maven-$name") { - artifactId = "ksmt-z3-native-$name" + artifactId = artifactName artifact(jarTask.get()) artifact(sourcesJarTask.get())