Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency versions unification #1368

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
39 changes: 30 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ kotlin.code.style=official
# IC for AndroidStudio
ideType=IC
ideVersion=222.4167.29
androidIdeVersion=212.5712.43
androidKotlinPluginVersion=212-1.7.10-release-333-AS5457.46
kotlinPluginVersion=222-1.7.20-release-201-IJ4167.29

pythonIde=IC,IU,PC,PY
jsIde=IU,PY,WS
Expand All @@ -15,17 +18,16 @@ jsIde=IU,PY,WS
pythonCommunityPluginVersion=222.4167.37
pythonUltimatePluginVersion=222.4167.37

kotlinPluginVersion=222-1.7.20-release-201-IJ4167.29

junit5Version=5.8.0-RC1
junit4Version=4.13.2
junit4PlatformVersion=1.9.0
mockitoVersion=3.5.13
mockitoVersion=4.2.0
mockitoInlineVersion=4.2.0
z3Version=4.8.9.1
z3JavaApiVersion=4.8.9
sootVersion=4.4.0-FORK-2
kotlinVersion=1.7.20
log4j2Version=2.13.3
log4j2Version=2.17.1
coroutinesVersion=1.6.3
collectionsVersion=0.3.4
# after updating plugin version you should manually bump corresponding versions in plugin
Expand All @@ -41,12 +43,12 @@ rdVersion=2022.2.1
# to enable - add -PincludeRiderInBuild=true in build CLI
includeRiderInBuild=false
jacocoVersion=0.8.8
commonsLangVersion=3.11
commonsIoVersion=2.8.0
kotlinLoggingVersion=1.8.3
ktorVersion=1.4.1
cliktVersion=3.2.0
guavaVersion=30.0-jre
commonsIoVersion=2.8.0
apacheCommonsLangVersion=3.11
apacheCommonsExecVersion=1.2
apacheCommonsTextVersion=1.9
rgxgenVersion=1.3
Expand All @@ -55,8 +57,7 @@ kryoVersion=5.3.0
kryoSerializersVersion=0.45
asmVersion=9.2
testNgVersion=7.6.0
mockitoInlineVersion=4.0.0
jacksonVersion = 2.12.3
jacksonVersion=2.12.3
javasmtSolverZ3Version=4.8.9-sosy1
slf4jVersion=1.7.36
eclipseAetherVersion=1.1.0
Expand All @@ -67,12 +68,32 @@ mavenPluginTestingVersion=3.3.0
mavenResolverApiVersion=1.8.0
sisuPlexusVersion=0.3.5
javaCppVersion=1.5.3
jsoupVersion=1.7.2
jsoupVersion=1.15.3
djlApiVersion=0.17.0
pytorchNativeVersion=1.9.1
shadowJarVersion=7.1.2
openblasVersion=0.3.10-1.5.4
arpackNgVersion=3.7.0-1.5.4
moshiVersion=1.14.0
functionaljavaVersion=5.0
jetbrainsAnnotationsVersion=16.0.2
haifenglSmileVersion=2.6.0
javaparserVersion=3.22.1
findbugsAnnotationsVersion=1.3.9-1
lombokVersion=1.18.20
findbugsJsr305Version=3.0.2
validationApiVersion=2.0.0.Final
junitJupiterVersion=5.9.0
junitJupiterJava8Version=5.8.1
apacheHttpClientVersion=5.1
jsonVersion=20220320
jnaPlatformVersion=5.5.0
jcommanderVersion=1.74
gsonVersion=2.8.9
tablesawVersion=0.38.2
gradlePluginPublishVersion=0.18.0
mockServerNettyVersion=5.4.1
kotlinSerializationJsonVersion=1.4.1

# configuration for build server
org.gradle.daemon=false
Expand Down
6 changes: 3 additions & 3 deletions utbot-analytics-torch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ dependencies {
implementation group: 'org.bytedeco', name: 'javacpp', version: javaCppVersion, classifier: "$classifier"
implementation group: 'org.jsoup', name: 'jsoup', version: jsoupVersion

implementation "ai.djl:api:$djlApiVersion"
implementation "ai.djl.pytorch:pytorch-engine:$djlApiVersion"
implementation "ai.djl.pytorch:pytorch-native-auto:$pytorchNativeVersion"
implementation group: 'ai.djl', name: 'api', version: djlApiVersion
implementation group: 'ai.djl.pytorch', name: 'pytorch-engine', version: djlApiVersion
implementation group: 'ai.djl.pytorch', name: 'pytorch-native-auto', version: pytorchNativeVersion

testImplementation project(':utbot-framework').sourceSets.test.output
}
Expand Down
20 changes: 10 additions & 10 deletions utbot-analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ dependencies {
testImplementation project(':utbot-sample')
testImplementation group: 'junit', name: 'junit', version: junit4Version

implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
implementation(group: 'org.unittestbot.soot', name: 'soot-utbot-fork', version: sootVersion) {
exclude group:'com.google.guava', module:'guava'
}
implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0'
implementation group: 'com.github.haifengl', name: 'smile-plot', version: '2.6.0'
implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0'
implementation group: 'com.github.haifengl', name: 'smile-interpolation', version: '2.6.0'
implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: haifenglSmileVersion
implementation group: 'com.github.haifengl', name: 'smile-plot', version: haifenglSmileVersion
implementation group: 'com.github.haifengl', name: 'smile-core', version: haifenglSmileVersion
implementation group: 'com.github.haifengl', name: 'smile-interpolation', version: haifenglSmileVersion
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion

implementation group: 'org.bytedeco', name: 'arpack-ng', version: arpackNgVersion, classifier: "$classifier"
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "$classifier"

implementation group: 'tech.tablesaw', name: 'tablesaw-core', version: '0.38.2'
implementation group: 'tech.tablesaw', name: 'tablesaw-jsplot', version: '0.38.2'
implementation group: 'tech.tablesaw', name: 'tablesaw-core', version: tablesawVersion
implementation group: 'tech.tablesaw', name: 'tablesaw-jsplot', version: tablesawVersion

implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
implementation group: 'com.github.javaparser', name: 'javaparser-core', version: '3.22.1'
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
implementation group: 'com.github.javaparser', name: 'javaparser-core', version: javaparserVersion

testImplementation project(':utbot-testing')
testImplementation project(':utbot-framework').sourceSets.test.output
Expand Down
7 changes: 5 additions & 2 deletions utbot-android-studio/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
val androidIdeVersion: String by rootProject
val androidKotlinPluginVersion: String by rootProject

plugins {
id("org.jetbrains.intellij") version "1.7.0"
}
Expand All @@ -19,12 +22,12 @@ intellij {

val jvmPlugins = listOf(
"java",
"org.jetbrains.kotlin:212-1.7.10-release-333-AS5457.46"
"org.jetbrains.kotlin:$androidKotlinPluginVersion"
)

plugins.set(jvmPlugins + androidPlugins)

version.set("212.5712.43")
version.set(androidIdeVersion)
type.set("IC")
}

Expand Down
4 changes: 2 additions & 2 deletions utbot-cli-js/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ dependencies {
implementation project(':utbot-js')

// Without this dependency testng tests do not run.
implementation group: 'com.beust', name: 'jcommander', version: '1.48'
implementation group: 'com.beust', name: 'jcommander', version: jcommanderVersion
implementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4PlatformVersion
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
implementation group: 'com.github.ajalt.clikt', name: 'clikt', version: cliktVersion
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junit5Version
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit5Version
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j2Version
implementation group: 'org.json', name: 'json', version: '20220320'
implementation group: 'org.json', name: 'json', version: jsonVersion
//noinspection GroovyAssignabilityCheck
fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration: 'instrumentationArchive')
}
Expand Down
2 changes: 1 addition & 1 deletion utbot-cli-python/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {

implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
// Without this dependency testng tests do not run.
implementation group: 'com.beust', name: 'jcommander', version: '1.48'
implementation group: 'com.beust', name: 'jcommander', version: jcommanderVersion
implementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4PlatformVersion
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
implementation group: 'com.github.ajalt.clikt', name: 'clikt', version: cliktVersion
Expand Down
2 changes: 1 addition & 1 deletion utbot-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
// Without this dependency testng tests do not run.
implementation group: 'com.beust', name: 'jcommander', version: '1.48'
implementation group: 'com.beust', name: 'jcommander', version: jcommanderVersion
implementation group: 'org.testng', name: 'testng', version: testNgVersion
implementation group: 'junit', name: 'junit', version: junit4Version
implementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4PlatformVersion
Expand Down
3 changes: 2 additions & 1 deletion utbot-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

val kotlinLoggingVersion: String by rootProject
val junit4Version: String by rootProject
val jnaPlatformVersion: String by rootProject

plugins {
id("com.github.johnrengelman.shadow") version "7.1.2"
}

dependencies {
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.5.0")
implementation(group = "net.java.dev.jna", name = "jna-platform", version = jnaPlatformVersion)

testImplementation(group = "junit", name = "junit", version = junit4Version)
}
Expand Down
12 changes: 6 additions & 6 deletions utbot-framework-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

val junit4Version: String by rootProject
val sootVersion: String by rootProject
val commonsLangVersion: String by rootProject
val apacheCommonsLangVersion: String by rootProject
val rdVersion: String by rootProject
val kotlinLoggingVersion: String? by rootProject
val rdVersion: String? by rootProject

plugins {
id("com.github.johnrengelman.shadow") version "7.1.2"
Expand All @@ -14,14 +14,14 @@ dependencies {
api(project(":utbot-core"))
api(project(":utbot-api"))
api(project(":utbot-rd"))
implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdVersion)
implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdVersion)
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
implementation(group = "com.jetbrains.rd", name = "rd-framework", version = rdVersion)
implementation(group = "com.jetbrains.rd", name = "rd-core", version = rdVersion)
implementation(group = "org.unittestbot.soot", name = "soot-utbot-fork", version = sootVersion) {
exclude(group="com.google.guava", module="guava")
}
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
// TODO do we really need apache commons?
implementation(group = "org.apache.commons", name = "commons-lang3", version = commonsLangVersion)
implementation(group = "org.apache.commons", name = "commons-lang3", version = apacheCommonsLangVersion)
testImplementation(group = "junit", name = "junit", version = junit4Version)
}

Expand Down
12 changes: 5 additions & 7 deletions utbot-framework-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
testImplementation project(":utbot-framework").sourceSets.test.output
testImplementation project(":utbot-core").sourceSets.test.output

implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
implementation(group: "org.unittestbot.soot", name: "soot-utbot-fork", version: sootVersion) {
exclude group:'com.google.guava', module:'guava'
}

Expand All @@ -45,24 +45,22 @@ dependencies {
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
// we need this for construction mocks from composite models
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion

// To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section
// testImplementation group: 'junit', name: 'junit', version: '4.13.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
// used for testing code generation
testImplementation group: 'commons-io', name: 'commons-io', version: commonsIoVersion
testImplementation group: 'junit', name: 'junit', version: junit4Version
testImplementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4PlatformVersion
testImplementation group: 'org.antlr', name: 'antlr4', version: antlrVersion
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
testImplementation group: 'org.testng', name: 'testng', version: testNgVersion
testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
testImplementation group: 'org.testng', name: 'testng', version: testNgVersion
testImplementation group: 'com.google.guava', name: 'guava', version: guavaVersion

testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version

z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3Version, ext: 'zip'
Expand Down
8 changes: 4 additions & 4 deletions utbot-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion

implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
implementation(group: "org.unittestbot.soot", name: "soot-utbot-fork", version: sootVersion) {
exclude group:'com.google.guava', module:'guava'
}
implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
Expand All @@ -35,12 +35,12 @@ dependencies {
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
// we need this for construction mocks from composite models
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion

// To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section
//implementation group: 'junit', name: 'junit', version: '4.13.1'
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1'
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1'
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion

z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3Version, ext: 'zip'
z3native group: 'com.microsoft.z3', name: 'z3-native-linux64', version: z3Version, ext: 'zip'
Expand Down
2 changes: 1 addition & 1 deletion utbot-fuzzers/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation(project(":utbot-framework-api"))
api(project(":utbot-fuzzing"))

implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
implementation(group = "org.unittestbot.soot", name = "soot-utbot-fork", version = sootVersion) {
exclude(group="com.google.guava", module="guava")
}
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
Expand Down
6 changes: 3 additions & 3 deletions utbot-gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ dependencies {
shadow localGroovy()

implementation project(":utbot-framework")
implementation "io.github.microutils:kotlin-logging:$kotlinLoggingVersion"
implementation group: "io.github.microutils", name: "kotlin-logging", version: kotlinLoggingVersion

testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation "org.mockito:mockito-inline:$mockitoVersion"
testImplementation group: "org.mockito", name: "mockito-core", version: mockitoVersion
testImplementation group: "org.mockito", name: "mockito-inline", version: mockitoInlineVersion

fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration: 'instrumentationArchive')
}
Expand Down
7 changes: 3 additions & 4 deletions utbot-instrumentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ dependencies {

implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0'

implementation group: 'net.java.dev.jna', name: 'jna-platform', version: jnaPlatformVersion

// TODO: this is necessary for inline classes mocking in UtExecutionInstrumentation
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
implementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
}

jar {
Expand Down
9 changes: 5 additions & 4 deletions utbot-intellij-js/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val intellijPluginVersion: String? by rootProject
val kotlinLoggingVersion: String? by rootProject
val apacheCommonsTextVersion: String? by rootProject
val jacksonVersion: String? by rootProject
val junitJupiterVersion: String? by rootProject

val ideType: String? by rootProject
val ideVersion: String? by rootProject
val kotlinPluginVersion: String? by rootProject
Expand Down Expand Up @@ -33,8 +33,9 @@ tasks {
}

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitJupiterVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitJupiterVersion)

implementation(project(":utbot-ui-commons"))

//Family
Expand Down
11 changes: 6 additions & 5 deletions utbot-intellij-python/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val intellijPluginVersion: String? by rootProject
val kotlinLoggingVersion: String? by rootProject
val apacheCommonsTextVersion: String? by rootProject
val jacksonVersion: String? by rootProject
val junitJupiterVersion: String? by rootProject

val ideType: String? by rootProject
val ideVersion: String by rootProject
val kotlinPluginVersion: String by rootProject
Expand Down Expand Up @@ -33,8 +33,9 @@ tasks {
}

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitJupiterVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitJupiterVersion)

implementation(project(":utbot-ui-commons"))

//Family
Expand All @@ -47,7 +48,7 @@ intellij {

val jvmPlugins = listOf(
"java",
"org.jetbrains.kotlin:222-1.7.20-release-201-IJ4167.29"
"org.jetbrains.kotlin:$kotlinPluginVersion"
)

val pythonCommunityPlugins = listOf(
Expand Down
Loading