Skip to content

Commit d566c2d

Browse files
authored
Fix JDK (#175)
* Fix JDK * Fix shadow
1 parent a7802bc commit d566c2d

File tree

9 files changed

+44
-38
lines changed

9 files changed

+44
-38
lines changed

.github/workflows/build-and-run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-java@v4
2727
with:
2828
java-version: 17
29-
distribution: 'zulu'
29+
distribution: 'temurin'
3030
cache: gradle
3131

3232
- name: Setup gradle

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: Set up JDK 17
15+
- name: Set up JDK 8
1616
uses: actions/setup-java@v4
1717
with:
18-
java-version: 17
19-
distribution: 'zulu'
18+
java-version: 8
19+
distribution: 'temurin'
2020
cache: gradle
2121

2222
- name: Setup gradle

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Get the most out of SMT solving with KSMT features:
1111
* Streamlined [solver delivery](#ksmt-distribution) with no need for building a solver or implementing JVM bindings
1212

1313
[![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)
14-
[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.6.1)
14+
[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.6.2)
1515
[![javadoc](https://javadoc.io/badge2/io.ksmt/ksmt-core/javadoc.svg)](https://javadoc.io/doc/io.ksmt/ksmt-core)
1616

1717
## Get started
@@ -20,9 +20,9 @@ To start using KSMT, install it via [Gradle](https://gradle.org/):
2020

2121
```kotlin
2222
// core
23-
implementation("io.ksmt:ksmt-core:0.6.1")
23+
implementation("io.ksmt:ksmt-core:0.6.2")
2424
// z3 solver
25-
implementation("io.ksmt:ksmt-z3:0.6.1")
25+
implementation("io.ksmt:ksmt-z3:0.6.2")
2626
```
2727

2828
Find basic instructions in the [Getting started](docs/getting-started.md) guide and try it out with the

buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
group = "io.ksmt"
14-
version = "0.6.1"
14+
version = "0.6.2"
1515

1616
repositories {
1717
mavenCentral()

docs/getting-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ repositories {
3434
```kotlin
3535
dependencies {
3636
// core
37-
implementation("io.ksmt:ksmt-core:0.6.1")
37+
implementation("io.ksmt:ksmt-core:0.6.2")
3838
}
3939
```
4040

@@ -43,9 +43,9 @@ dependencies {
4343
```kotlin
4444
dependencies {
4545
// z3
46-
implementation("io.ksmt:ksmt-z3:0.6.1")
46+
implementation("io.ksmt:ksmt-z3:0.6.2")
4747
// bitwuzla
48-
implementation("io.ksmt:ksmt-bitwuzla:0.6.1")
48+
implementation("io.ksmt:ksmt-bitwuzla:0.6.2")
4949
}
5050
```
5151

examples/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ repositories {
99

1010
dependencies {
1111
// core
12-
implementation("io.ksmt:ksmt-core:0.6.1")
12+
implementation("io.ksmt:ksmt-core:0.6.2")
1313
// z3 solver
14-
implementation("io.ksmt:ksmt-z3:0.6.1")
14+
implementation("io.ksmt:ksmt-z3:0.6.2")
1515
// Runner and portfolio solver
16-
implementation("io.ksmt:ksmt-runner:0.6.1")
16+
implementation("io.ksmt:ksmt-runner:0.6.2")
1717
}
1818

1919
java {

ksmt-cvc5/ksmt-cvc5-core/build.gradle.kts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
44
id("io.ksmt.ksmt-base")
5-
id("com.gradleup.shadow") version "9.0.0-beta13"
5+
id("com.gradleup.shadow") version "9.0.0-beta13" apply false
66
}
77

88
val distDir = projectDir.parentFile.resolve("dist")
@@ -21,21 +21,23 @@ dependencies {
2121
testImplementation(project(":ksmt-cvc5:ksmt-cvc5-native"))
2222
}
2323

24-
tasks.withType<ShadowJar> {
25-
archiveClassifier.set("")
24+
val publishJar = tasks.register<ShadowJar>("publish-jar") {
25+
dependsOn(tasks.named("jar"))
26+
27+
archiveClassifier.set("pub")
2628
dependencies {
2729
include(dependency(files(cvc5Jar)))
2830
}
29-
val implementation = project.configurations["implementation"].dependencies.toSet()
30-
val runtimeOnly = project.configurations["runtimeOnly"].dependencies.toSet()
31-
val dependencies = (implementation + runtimeOnly)
32-
project.configurations.shadow.get().dependencies.addAll(dependencies)
31+
32+
configurations = listOf(project.configurations.runtimeClasspath.get())
33+
34+
with(tasks.jar.get() as CopySpec)
3335
}
3436

3537
publishing {
3638
publications {
3739
create<MavenPublication>("maven") {
38-
project.shadow.component(this)
40+
artifact(publishJar.get())
3941

4042
addKsmtPom()
4143
generateMavenMetadata(project)

ksmt-yices/ksmt-yices-core/build.gradle.kts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
44
id("io.ksmt.ksmt-base")
5-
id("com.gradleup.shadow") version "9.0.0-beta13"
5+
id("com.gradleup.shadow") version "9.0.0-beta13" apply false
66
`java-test-fixtures`
77
}
88

@@ -21,21 +21,23 @@ dependencies {
2121
testImplementation(project(":ksmt-yices:ksmt-yices-native"))
2222
}
2323

24-
tasks.withType<ShadowJar> {
25-
archiveClassifier.set("")
24+
val publishJar = tasks.register<ShadowJar>("publish-jar") {
25+
dependsOn(tasks.named("jar"))
26+
27+
archiveClassifier.set("pub")
2628
dependencies {
2729
exclude { true }
2830
}
29-
val implementation = project.configurations["implementation"].dependencies.toSet()
30-
val runtimeOnly = project.configurations["runtimeOnly"].dependencies.toSet()
31-
val dependencies = (implementation + runtimeOnly)
32-
project.configurations.shadow.get().dependencies.addAll(dependencies)
31+
32+
configurations = listOf(project.configurations.runtimeClasspath.get())
33+
34+
with(tasks.jar.get() as CopySpec)
3335
}
3436

3537
publishing {
3638
publications {
3739
create<MavenPublication>("maven") {
38-
project.shadow.component(this)
40+
artifact(publishJar.get())
3941

4042
addKsmtPom()
4143
generateMavenMetadata(project)

ksmt-z3/ksmt-z3-core/build.gradle.kts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
44
id("io.ksmt.ksmt-base")
5-
id("com.gradleup.shadow") version "9.0.0-beta13"
5+
id("com.gradleup.shadow") version "9.0.0-beta13" apply false
66
}
77

88
repositories {
@@ -23,21 +23,23 @@ dependencies {
2323
testImplementation(project(":ksmt-z3:ksmt-z3-native"))
2424
}
2525

26-
tasks.withType<ShadowJar> {
27-
archiveClassifier.set("")
26+
val publishJar = tasks.register<ShadowJar>("publish-jar") {
27+
dependsOn(tasks.named("jar"))
28+
29+
archiveClassifier.set("pub")
2830
dependencies {
2931
include(dependency(z3JavaJar.outputFiles))
3032
}
31-
val implementation = project.configurations["implementation"].dependencies.toSet()
32-
val runtimeOnly = project.configurations["runtimeOnly"].dependencies.toSet()
33-
val dependencies = (implementation + runtimeOnly)
34-
project.configurations.shadow.get().dependencies.addAll(dependencies)
33+
34+
configurations = listOf(project.configurations.runtimeClasspath.get())
35+
36+
with(tasks.jar.get() as CopySpec)
3537
}
3638

3739
publishing {
3840
publications {
3941
create<MavenPublication>("maven") {
40-
project.shadow.component(this)
42+
artifact(publishJar.get())
4143

4244
addKsmtPom()
4345
generateMavenMetadata(project)

0 commit comments

Comments
 (0)