Skip to content

Commit

Permalink
Updated versions: gradle, java, jacoco, kotlin, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
leventeBajczi committed Apr 7, 2022
1 parent d92670d commit 218bd92
Show file tree
Hide file tree
Showing 33 changed files with 132 additions and 96 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: 1.17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: 1.17
- name: Install VC-Redist 2010 and 2012
run: |
Install-Module -Name VcRedist -Force
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: 1.17
- name: Generate Javadoc
run: ./gradlew aggregateJavadoc
- name: Deploy Javadoc
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ fun gradlePlugin(id: String, version: String): String = "$id:$id.gradle.plugin:$

dependencies {
compileOnly(gradleKotlinDsl())
compile(kotlin("gradle-plugin", kotlinVersion))
compile(gradlePlugin("com.github.johnrengelman.shadow", shadowVersion))
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation(gradlePlugin("com.github.johnrengelman.shadow", shadowVersion))
}

// Force the embeddable Kotlin compiler version to be the selected kotlinVersion.
Expand Down
12 changes: 6 additions & 6 deletions buildSrc/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
javaVersion=11
kotlinVersion=1.3.0
shadowVersion=6.1.0
antlrVersion=4.7.2
guavaVersion=23.6-jre
javaVersion=17
kotlinVersion=1.6.20
shadowVersion=7.1.2
antlrVersion=4.9.2
guavaVersion=31.1-jre
jcommanderVersion=1.72
z3Version=4.5.0
junitVersion=4.12
jacocoVersion=0.8.2
jacocoVersion=0.8.8
mockitoVersion=2.2.11
2 changes: 1 addition & 1 deletion docker/theta-cfa-cli.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.6-slim
FROM openjdk:17.0.2-slim

RUN apt-get update && \
apt-get install -y --no-install-recommends libgomp1 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/theta-sts-cli.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.6-slim
FROM openjdk:17.0.2-slim

RUN apt-get update && \
apt-get install -y --no-install-recommends libgomp1 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/theta-xsts-cli.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.6-slim
FROM openjdk:17.0.2-slim

RUN apt-get update && \
apt-get install -y --no-install-recommends libgomp1 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/theta-xta-cli.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.6-slim
FROM openjdk:17.0.2-slim

RUN apt-get update && \
apt-get install -y --no-install-recommends libgomp1 && \
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 5 additions & 4 deletions subprojects/cfa/cfa-analysis/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ plugins {
}

dependencies {
compile(project(":theta-analysis"))
compile(project(":theta-cfa"))
compile(project(":theta-common"))
compile(project(":theta-core"))
implementation(project(":theta-analysis"))
implementation(project(":theta-cfa"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
testImplementation(project(":theta-solver-z3"))
testImplementation(project(":theta-solver-smtlib"))
}
12 changes: 8 additions & 4 deletions subprojects/cfa/cfa-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ plugins {
}

dependencies {
compile(project(":theta-cfa"))
compile(project(":theta-cfa-analysis"))
compile(project(":theta-solver-z3"))
compile(project(":theta-solver-smtlib"))
implementation(project(":theta-cfa"))
implementation(project(":theta-solver"))
implementation(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-analysis"))
implementation(project(":theta-cfa-analysis"))
implementation(project(":theta-solver-z3"))
implementation(project(":theta-solver-smtlib"))
}

application {
Expand Down
4 changes: 2 additions & 2 deletions subprojects/cfa/cfa/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
}
6 changes: 3 additions & 3 deletions subprojects/common/analysis/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-solver"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
testImplementation(project(":theta-solver-z3"))
}
3 changes: 2 additions & 1 deletion subprojects/common/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
implementation(project(":theta-common"))
testFixturesImplementation(project(":theta-common"))
val libPath: String by rootProject.extra
testFixturesImplementation(fileTree(mapOf("dir" to libPath, "include" to listOf("*.jar"))))
testFixturesImplementation(Deps.guava)
Expand Down
3 changes: 2 additions & 1 deletion subprojects/frontends/c-frontend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ plugins {
id("antlr-grammar")
}
dependencies {
compile(project(":theta-core"))
implementation(project(":theta-core"))
implementation(project(":theta-common"))
}
4 changes: 3 additions & 1 deletion subprojects/solver/solver-smtlib-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ plugins {
}

dependencies {
compile(project(":theta-solver-smtlib"))
implementation(project(":theta-solver-smtlib"))
implementation(project(":theta-common"))
implementation(project(":theta-solver"))
}

application {
Expand Down
10 changes: 5 additions & 5 deletions subprojects/solver/solver-smtlib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-solver"))
compile("org.apache.commons:commons-compress:1.20")
compile("com.zaxxer:nuprocess:2.0.2")
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
implementation("org.apache.commons:commons-compress:1.20")
implementation("com.zaxxer:nuprocess:2.0.2")
testImplementation(testFixtures(project(":theta-core")))
}
6 changes: 3 additions & 3 deletions subprojects/solver/solver-z3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-solver"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
implementation(files(rootDir.resolve(Deps.z3)))
testImplementation(testFixtures(project(":theta-core")))
}
4 changes: 2 additions & 2 deletions subprojects/solver/solver/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
}
9 changes: 5 additions & 4 deletions subprojects/sts/sts-analysis/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ plugins {
}

dependencies {
compile(project(":theta-analysis"))
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-sts"))
implementation(project(":theta-analysis"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-sts"))
implementation(project(":theta-solver"))
testImplementation(project(":theta-solver-z3"))
}
10 changes: 7 additions & 3 deletions subprojects/sts/sts-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ plugins {
}

dependencies {
compile(project(":theta-sts"))
compile(project(":theta-sts-analysis"))
compile(project(":theta-solver-z3"))
implementation(project(":theta-sts"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-analysis"))
implementation(project(":theta-solver"))
implementation(project(":theta-sts-analysis"))
implementation(project(":theta-solver-z3"))
}

application {
Expand Down
4 changes: 2 additions & 2 deletions subprojects/sts/sts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
}
10 changes: 5 additions & 5 deletions subprojects/xcfa/cat/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
}

dependencies {
compile(project(":theta-xcfa"))
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-solver"))
compile(project(":theta-solver-z3"))
implementation(project(":theta-xcfa"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
implementation(project(":theta-solver-z3"))
}
18 changes: 12 additions & 6 deletions subprojects/xcfa/xcfa-analysis/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ plugins {
}

dependencies {
compile(project(":theta-cfa-analysis"))
compile(project(":theta-xcfa"))
compile(project(":theta-core"))
compile(project(":theta-cat"))
compile(project(":theta-common"))
compile(project(":theta-solver-smtlib"))
implementation(project(":theta-cfa"))
implementation(project(":theta-cfa-analysis"))
implementation(project(":theta-xcfa"))
implementation(project(":theta-core"))
implementation(project(":theta-cat"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-analysis"))
implementation(project(":theta-solver"))
implementation(project(":theta-solver-z3"))
implementation(project(":theta-c-frontend"))
implementation(project(":theta-solver-smtlib"))
}
18 changes: 12 additions & 6 deletions subprojects/xcfa/xcfa-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ plugins {
}

dependencies {
compile(project(":theta-xcfa"))
compile(project(":theta-xcfa-analysis"))
compile(project(":theta-solver-z3"))
compile(project(":theta-cfa-analysis"))
compile(project(":theta-cfa"))
compile(project(":theta-cfa-cli"))
implementation(project(":theta-xcfa"))
implementation(project(":theta-xcfa-analysis"))
implementation(project(":theta-solver-z3"))
implementation(project(":theta-cfa-analysis"))
implementation(project(":theta-cfa"))
implementation(project(":theta-common"))
implementation(project(":theta-solver"))
implementation(project(":theta-c-frontend"))
implementation(project(":theta-core"))
implementation(project(":theta-analysis"))
implementation(project(":theta-solver-smtlib"))
implementation(project(":theta-cfa-cli"))
}

application {
Expand Down
14 changes: 7 additions & 7 deletions subprojects/xcfa/xcfa/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-cfa"))
compile(project(":theta-cfa-analysis"))
compile(project(":theta-solver-z3"))
compile(project(":theta-c-frontend"))
testCompile(project(":theta-c-frontend"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-cfa"))
implementation(project(":theta-cfa-analysis"))
implementation(project(":theta-solver-z3"))
implementation(project(":theta-c-frontend"))
testImplementation(project(":theta-c-frontend"))
}
9 changes: 5 additions & 4 deletions subprojects/xsts/xsts-analysis/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ plugins {
}

dependencies {
compile(project(":theta-analysis"))
compile(project(":theta-common"))
compile(project(":theta-core"))
compile(project(":theta-xsts"))
implementation(project(":theta-analysis"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
implementation(project(":theta-solver"))
implementation(project(":theta-xsts"))
testImplementation(project(":theta-solver-z3"))
}
10 changes: 7 additions & 3 deletions subprojects/xsts/xsts-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ plugins {
}

dependencies {
compile(project(":theta-xsts"))
compile(project(":theta-xsts-analysis"))
compile(project(":theta-solver-z3"))
implementation(project(":theta-xsts"))
implementation(project(":theta-xsts-analysis"))
implementation(project(":theta-analysis"))
implementation(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-solver-z3"))
implementation(project(":theta-solver"))
}

application {
Expand Down
4 changes: 2 additions & 2 deletions subprojects/xsts/xsts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ plugins {
}

dependencies {
compile(project(":theta-common"))
compile(project(":theta-core"))
implementation(project(":theta-common"))
implementation(project(":theta-core"))
}
Loading

0 comments on commit 218bd92

Please sign in to comment.