Skip to content

Commit

Permalink
Merge pull request #116 from ftsrg/ci-fix
Browse files Browse the repository at this point in the history
CI build fix
  • Loading branch information
mondokm authored May 26, 2021
2 parents 5d0895d + 99e8b04 commit 53bbe13
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {

allprojects {
group = "hu.bme.mit.inf.theta"
version = "2.13.0"
version = "2.14.0"

apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Deps {
val runtime = "org.antlr:antlr4-runtime:${Versions.antlr}"
}

val z3 = "z3:com.microsoft.z3:${Versions.z3}"
val z3 = "lib/com.microsoft.z3.jar"

val jcommander = "com.beust:jcommander:${Versions.jcommander}"

Expand Down
3 changes: 0 additions & 3 deletions gradle/shared-with-buildSrc/mirrors.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
repositories {
mavenCentral()
maven {
setUrl("https://dl.bintray.com/ftsrg/maven")
}
}
16 changes: 15 additions & 1 deletion lib/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
This folder contains dependencies for Theta.
See [Build.md](../doc/Build.md#dependencies) for more information.
See [Build.md](../doc/Build.md#dependencies) for more information.

Z3 is licensed under the following license:
```
Z3
Copyright (c) Microsoft Corporation
All rights reserved.
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
```
Binary file added lib/com.microsoft.z3.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion subprojects/common/solver-z3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-solver"))
implementation(Deps.z3)
implementation(files(rootDir.resolve(Deps.z3)))
}

0 comments on commit 53bbe13

Please sign in to comment.