diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 22b7511de..c08903899 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -15,7 +15,7 @@ jobs: name: Run tests strategy: matrix: - os: [ ubuntu-latest, windows-latest, macos-latest ] + os: [ ubuntu-20.04, windows-latest, macos-latest ] runs-on: ${{ matrix.os }} diff --git a/README.md b/README.md index cefc4deb7..64512b5ae 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.14) +[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.5.15) [![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.14") +implementation("io.ksmt:ksmt-core:0.5.15") // z3 solver -implementation("io.ksmt:ksmt-z3:0.5.14") +implementation("io.ksmt:ksmt-z3:0.5.15") ``` 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 749500ba0..b7cbe44d7 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.14" +version = "0.5.15" repositories { mavenCentral() diff --git a/docs/getting-started.md b/docs/getting-started.md index f1eeb9141..41446e121 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.14") + implementation("io.ksmt:ksmt-core:0.5.15") } ``` @@ -43,9 +43,9 @@ dependencies { ```kotlin dependencies { // z3 - implementation("io.ksmt:ksmt-z3:0.5.14") + implementation("io.ksmt:ksmt-z3:0.5.15") // bitwuzla - implementation("io.ksmt:ksmt-bitwuzla:0.5.14") + implementation("io.ksmt:ksmt-bitwuzla:0.5.15") } ``` diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index be8527bb7..0189ef167 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.14") + implementation("io.ksmt:ksmt-core:0.5.15") // z3 solver - implementation("io.ksmt:ksmt-z3:0.5.14") + implementation("io.ksmt:ksmt-z3:0.5.15") // Runner and portfolio solver - implementation("io.ksmt:ksmt-runner:0.5.14") + implementation("io.ksmt:ksmt-runner:0.5.15") } java { diff --git a/ksmt-bitwuzla/bindings-native/CMakeLists.txt b/ksmt-bitwuzla/bindings-native/CMakeLists.txt index 28bbfccc8..72ce83993 100644 --- a/ksmt-bitwuzla/bindings-native/CMakeLists.txt +++ b/ksmt-bitwuzla/bindings-native/CMakeLists.txt @@ -20,9 +20,9 @@ ADD_LIBRARY (bitwuzla_jni SHARED bitwuzla_jni.cpp bitwuzla_extension.c) TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${JNI_INCLUDE_DIRS}) TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${BITWUZLA_INCLUDE}) -SET(BITWUZLA_SRC_INCLUDE "${BITWUZLA_SRC_ROOT}/bitwuzla/src") +SET(BITWUZLA_SRC_INCLUDE "${BITWUZLA_SRC_ROOT}") TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${BITWUZLA_SRC_INCLUDE}) SET(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) -TARGET_LINK_LIBRARIES(bitwuzla_jni PRIVATE ${BITWUZLA_LIB}) +TARGET_LINK_LIBRARIES(bitwuzla_jni PRIVATE ${BITWUZLA_LIB} -static-libgcc -static-libstdc++) diff --git a/ksmt-bitwuzla/dist/bitwuzla-linux64-1.0.zip b/ksmt-bitwuzla/dist/bitwuzla-linux64-1.0.zip index 7991c7044..527615c62 100644 Binary files a/ksmt-bitwuzla/dist/bitwuzla-linux64-1.0.zip and b/ksmt-bitwuzla/dist/bitwuzla-linux64-1.0.zip differ diff --git a/ksmt-bitwuzla/dist/build.md b/ksmt-bitwuzla/dist/build.md index 0df12ccfd..5be38b43d 100644 --- a/ksmt-bitwuzla/dist/build.md +++ b/ksmt-bitwuzla/dist/build.md @@ -19,17 +19,13 @@ To ensure that our distribution is portable, we verify that the produced binarie ```shell $ ldd libbitwuzla.so linux-vdso.so.1 (0x00007ffce92d0000) - libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007f2fdaa00000) libm.so.6 => /usr/lib/libm.so.6 (0x00007f2fdad18000) - libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007f2fdb192000) libc.so.6 => /usr/lib/libc.so.6 (0x00007f2fda819000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007f2fdb1e0000) $ ldd libbitwuzla_jni.so libbitwuzla.so => not found linux-vdso.so.1 (0x00007ffd1ddc6000) - libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007f6188800000) libm.so.6 => /usr/lib/libm.so.6 (0x00007f6188b18000) - libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007f6189006000) libc.so.6 => /usr/lib/libc.so.6 (0x00007f6188619000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007f618906d000) ``` diff --git a/ksmt-cvc5/dist/build.md b/ksmt-cvc5/dist/build.md index 32440cd68..d0d402823 100644 --- a/ksmt-cvc5/dist/build.md +++ b/ksmt-cvc5/dist/build.md @@ -21,16 +21,12 @@ To ensure that our distribution is portable, we verify that the produced binarie $ ldd libcvc5.so libcvc5jni.so libcvc5.so: linux-vdso.so.1 (0x00007ffe22381000) - libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007ff4c7800000) libm.so.6 => /usr/lib/libm.so.6 (0x00007ff4c8bf4000) - libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007ff4c8bd4000) libc.so.6 => /usr/lib/libc.so.6 (0x00007ff4c7619000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007ff4c8d0a000) libcvc5jni.so: linux-vdso.so.1 (0x00007ffccbbb5000) libcvc5.so => not found - libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007fa594e00000) - libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007fa5962db000) libc.so.6 => /usr/lib/libc.so.6 (0x00007fa594c19000) libm.so.6 => /usr/lib/libm.so.6 (0x00007fa5961f3000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007fa596389000) diff --git a/ksmt-cvc5/dist/cvc5-native-linux-x86-64-1.0.2.zip b/ksmt-cvc5/dist/cvc5-native-linux-x86-64-1.0.2.zip index 14e513e88..92631b18a 100644 Binary files a/ksmt-cvc5/dist/cvc5-native-linux-x86-64-1.0.2.zip and b/ksmt-cvc5/dist/cvc5-native-linux-x86-64-1.0.2.zip differ diff --git a/ksmt-yices/dist/yices-native-linux-x86-64-0.0.zip b/ksmt-yices/dist/yices-native-linux-x86-64-0.0.zip index f16b2c767..ad52a6fed 100644 Binary files a/ksmt-yices/dist/yices-native-linux-x86-64-0.0.zip and b/ksmt-yices/dist/yices-native-linux-x86-64-0.0.zip differ