From f12de24976c9a46a28bb727c46aaa4db65009226 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Thu, 10 Nov 2022 11:05:30 +0300 Subject: [PATCH 1/9] Unification of dependency versions --- gradle.properties | 38 ++++++++++++++++------ utbot-analytics-torch/build.gradle | 6 ++-- utbot-analytics/build.gradle | 20 ++++++------ utbot-android-studio/build.gradle.kts | 7 +++-- utbot-cli-js/build.gradle | 4 +-- utbot-cli-python/build.gradle | 2 +- utbot-cli/build.gradle | 2 +- utbot-core/build.gradle.kts | 3 +- utbot-framework-api/build.gradle.kts | 11 ++++--- utbot-framework-test/build.gradle | 12 +++---- utbot-framework/build.gradle | 12 +++---- utbot-fuzzers/build.gradle.kts | 2 +- utbot-gradle/build.gradle | 6 ++-- utbot-instrumentation-tests/build.gradle | 4 +-- utbot-instrumentation/build.gradle | 10 +++--- utbot-intellij-js/build.gradle.kts | 9 +++--- utbot-intellij-python/build.gradle.kts | 11 ++++--- utbot-intellij/build.gradle.kts | 11 ++++--- utbot-js/build.gradle.kts | 23 +++++++++----- utbot-junit-contest/build.gradle | 12 +++---- utbot-maven/build.gradle | 34 ++++++++++---------- utbot-python/build.gradle.kts | 40 +++++++++++++++--------- utbot-rd/build.gradle | 6 ++-- utbot-sample/build.gradle | 14 ++++----- utbot-summary/build.gradle.kts | 15 +++++---- utbot-ui-commons/build.gradle.kts | 11 +++++-- 26 files changed, 190 insertions(+), 135 deletions(-) diff --git a/gradle.properties b/gradle.properties index 202ade54a2..9f7ae71724 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 @@ -16,36 +19,34 @@ 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 intellijPluginVersion=1.7.0 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 +apacheCommonsTextVersion=1.10 rgxgenVersion=1.3 antlrVersion=4.9.2 kryoVersion=5.3.0 kryoSerializersVersion=0.45 asmVersion=9.2 testNgVersion=7.6.0 -mockitoInlineVersion=4.0.0 jacksonVersion = 2.12.3 javasmtSolverZ3Version=4.8.9-sosy1 slf4jVersion=1.7.36 @@ -57,12 +58,31 @@ 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 +rdFrameworkVersion=2022.3.1 +junitJupiterVersion=5.9.0 +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 org.gradle.daemon=false org.gradle.parallel=false diff --git a/utbot-analytics-torch/build.gradle b/utbot-analytics-torch/build.gradle index b1d10f43d9..dc4798301f 100644 --- a/utbot-analytics-torch/build.gradle +++ b/utbot-analytics-torch/build.gradle @@ -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 } diff --git a/utbot-analytics/build.gradle b/utbot-analytics/build.gradle index 1023802c5b..05e61cca18 100644 --- a/utbot-analytics/build.gradle +++ b/utbot-analytics/build.gradle @@ -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-framework').sourceSets.test.output } diff --git a/utbot-android-studio/build.gradle.kts b/utbot-android-studio/build.gradle.kts index 13cefccbba..2d2d932f04 100644 --- a/utbot-android-studio/build.gradle.kts +++ b/utbot-android-studio/build.gradle.kts @@ -1,3 +1,6 @@ +val androidIdeVersion: String by rootProject +val androidKotlinPluginVersion: String by rootProject + plugins { id("org.jetbrains.intellij") version "1.7.0" } @@ -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") } diff --git a/utbot-cli-js/build.gradle b/utbot-cli-js/build.gradle index e0aad8dce9..e7ad9b8773 100644 --- a/utbot-cli-js/build.gradle +++ b/utbot-cli-js/build.gradle @@ -20,7 +20,7 @@ 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 @@ -28,7 +28,7 @@ dependencies { 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') } diff --git a/utbot-cli-python/build.gradle b/utbot-cli-python/build.gradle index 9fd9d4fe24..76638e6a0d 100644 --- a/utbot-cli-python/build.gradle +++ b/utbot-cli-python/build.gradle @@ -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 diff --git a/utbot-cli/build.gradle b/utbot-cli/build.gradle index bf7b18b3c1..b7a3608ee2 100644 --- a/utbot-cli/build.gradle +++ b/utbot-cli/build.gradle @@ -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 diff --git a/utbot-core/build.gradle.kts b/utbot-core/build.gradle.kts index 7f957695f4..2a204cde16 100644 --- a/utbot-core/build.gradle.kts +++ b/utbot-core/build.gradle.kts @@ -2,6 +2,7 @@ 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" @@ -9,7 +10,7 @@ plugins { 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) } diff --git a/utbot-framework-api/build.gradle.kts b/utbot-framework-api/build.gradle.kts index 6874294048..5e1a8b4ecd 100644 --- a/utbot-framework-api/build.gradle.kts +++ b/utbot-framework-api/build.gradle.kts @@ -2,7 +2,8 @@ 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 rdFrameworkVersion: String by rootProject val kotlinLoggingVersion: String? by rootProject plugins { @@ -13,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 = "2022.3.1") - implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1") - implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") { + implementation(group = "com.jetbrains.rd", name = "rd-framework", version = rdFrameworkVersion) + implementation(group = "com.jetbrains.rd", name = "rd-core", version = rdFrameworkVersion) + 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) } diff --git a/utbot-framework-test/build.gradle b/utbot-framework-test/build.gradle index 1d4167e128..08af880493 100644 --- a/utbot-framework-test/build.gradle +++ b/utbot-framework-test/build.gradle @@ -32,7 +32,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' } @@ -44,24 +44,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' diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle index 1ffb748050..4ec3c8b48d 100644 --- a/utbot-framework/build.gradle +++ b/utbot-framework/build.gradle @@ -16,10 +16,10 @@ dependencies { api project(':utbot-framework-api') api project(':utbot-rd') - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1' + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion - 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 @@ -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' diff --git a/utbot-fuzzers/build.gradle.kts b/utbot-fuzzers/build.gradle.kts index ee77190275..1cd26a792e 100644 --- a/utbot-fuzzers/build.gradle.kts +++ b/utbot-fuzzers/build.gradle.kts @@ -18,7 +18,7 @@ tasks { dependencies { implementation(project(":utbot-framework-api")) - 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) diff --git a/utbot-gradle/build.gradle b/utbot-gradle/build.gradle index 28693ce90b..982fbf602c 100644 --- a/utbot-gradle/build.gradle +++ b/utbot-gradle/build.gradle @@ -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') } diff --git a/utbot-instrumentation-tests/build.gradle b/utbot-instrumentation-tests/build.gradle index 83cc69e5a8..4c4f291191 100644 --- a/utbot-instrumentation-tests/build.gradle +++ b/utbot-instrumentation-tests/build.gradle @@ -9,8 +9,8 @@ dependencies { testImplementation configurations.fetchInstrumentationJar testImplementation project(':utbot-sample') testImplementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1' + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion } processResources { diff --git a/utbot-instrumentation/build.gradle b/utbot-instrumentation/build.gradle index e9b76a34bb..b0d7e53e14 100644 --- a/utbot-instrumentation/build.gradle +++ b/utbot-instrumentation/build.gradle @@ -9,14 +9,14 @@ dependencies { implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryoSerializersVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1' - implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0' + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion + 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 { diff --git a/utbot-intellij-js/build.gradle.kts b/utbot-intellij-js/build.gradle.kts index bafc50275c..0ac8628287 100644 --- a/utbot-intellij-js/build.gradle.kts +++ b/utbot-intellij-js/build.gradle.kts @@ -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 @@ -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 diff --git a/utbot-intellij-python/build.gradle.kts b/utbot-intellij-python/build.gradle.kts index 9797f10378..b3792562a4 100644 --- a/utbot-intellij-python/build.gradle.kts +++ b/utbot-intellij-python/build.gradle.kts @@ -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 @@ -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 @@ -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( diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts index 4539792843..2b3c916d36 100644 --- a/utbot-intellij/build.gradle.kts +++ b/utbot-intellij/build.gradle.kts @@ -2,6 +2,9 @@ val intellijPluginVersion: String? by rootProject val kotlinLoggingVersion: String? by rootProject val apacheCommonsTextVersion: String? by rootProject val jacksonVersion: String? by rootProject +val rdFrameworkVersion: String? by rootProject +val apacheHttpClientVersion: String? by rootProject +val mockServerNettyVersion: String? by rootProject val ideType: String? by rootProject val ideVersion: String? by rootProject @@ -90,18 +93,18 @@ tasks { } dependencies { - implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1") - implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1") + implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdFrameworkVersion) + implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdFrameworkVersion) implementation(group ="com.esotericsoftware.kryo", name = "kryo5", version = kryoVersion) implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) - implementation("org.apache.httpcomponents.client5:httpclient5:5.1") + implementation(group = "org.apache.httpcomponents.client5", name = "httpclient5", version = apacheHttpClientVersion) implementation(group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version = jacksonVersion) implementation(project(":utbot-framework")) { exclude(group = "org.slf4j", module = "slf4j-api") } implementation(project(":utbot-fuzzers")) //api(project(":utbot-analytics")) - testImplementation("org.mock-server:mockserver-netty:5.4.1") + testImplementation(group = "org.mock-server", name = "mockserver-netty", version = mockServerNettyVersion) testApi(project(":utbot-framework")) implementation(project(":utbot-ui-commons")) diff --git a/utbot-js/build.gradle.kts b/utbot-js/build.gradle.kts index f868206db9..15ac4cf639 100644 --- a/utbot-js/build.gradle.kts +++ b/utbot-js/build.gradle.kts @@ -1,7 +1,12 @@ val intellijPluginVersion: String? by rootProject val kotlinLoggingVersion: String? by rootProject val apacheCommonsTextVersion: String? by rootProject +val commonsIoVersion: String? by rootProject val jacksonVersion: String? by rootProject +val functionaljavaVersion: String? by rootProject +val junitJupiterVersion: String? by rootProject +val jsonVersion: String? by rootProject + val ideType: String? by rootProject val pythonCommunityPluginVersion: String? by rootProject val pythonUltimatePluginVersion: String? by rootProject @@ -26,10 +31,12 @@ tasks { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") api(project(":utbot-framework")) implementation(project(":utbot-fuzzers")) + + testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitJupiterVersion) + testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitJupiterVersion) + // https://mvnrepository.com/artifact/org.graalvm.js/js implementation(group = "org.graalvm.js", name = "js", version = "22.1.0.1") @@ -43,13 +50,13 @@ dependencies { implementation(group = "org.graalvm.sdk", name = "graal-sdk", version = "22.1.0.1") // https://mvnrepository.com/artifact/org.json/json - implementation(group = "org.json", name = "json", version = "20220320") + implementation(group = "org.json", name = "json", version = jsonVersion) // https://mvnrepository.com/artifact/commons-io/commons-io - implementation(group = "commons-io", name = "commons-io", version = "2.11.0") - - implementation("org.functionaljava:functionaljava:5.0") - implementation("org.functionaljava:functionaljava-quickcheck:5.0") - implementation("org.functionaljava:functionaljava-java-core:5.0") + implementation(group = "commons-io", name = "commons-io", version = commonsIoVersion) implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) + + api(group = "org.functionaljava", name = "functionaljava", version = functionaljavaVersion) + api(group = "org.functionaljava", name = "functionaljava-quickcheck", version = functionaljavaVersion) + api(group = "org.functionaljava", name = "functionaljava-java-core", version = functionaljavaVersion) } \ No newline at end of file diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle index 720494e9b8..3feaf10211 100644 --- a/utbot-junit-contest/build.gradle +++ b/utbot-junit-contest/build.gradle @@ -52,16 +52,16 @@ dependencies { implementation project(":utbot-framework") implementation project(":utbot-analytics") - 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: 'org.apache.commons', name: 'commons-exec', version: '1.2' + implementation group: 'org.apache.commons', name: 'commons-exec', version: apacheCommonsExecVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion - implementation group: 'org.jsoup', name: 'jsoup', version: '1.6.2' + implementation group: 'org.jsoup', name: 'jsoup', version: jsoupVersion // prev 1.6.2, now it 1.7.2 and real last version 1.15.3 ! // need for tests - implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0' - implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0' - implementation 'junit:junit:4.13.2' + implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion + implementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion + implementation group: 'junit', name: 'junit', version: junit4Version testImplementation fileTree(dir: 'src/main/resources/projects/', include: '*/*.jar') testImplementation files('src/main/resources/evosuite/evosuite-1.2.0.jar') testImplementation files('src/main/resources/evosuite/evosuite-standalone-runtime-1.2.0.jar') diff --git a/utbot-maven/build.gradle b/utbot-maven/build.gradle index 52e027729e..93cd8274eb 100644 --- a/utbot-maven/build.gradle +++ b/utbot-maven/build.gradle @@ -5,23 +5,23 @@ configurations { dependencies { implementation project(':utbot-framework') - implementation "org.apache.maven:maven-core:$mavenPluginApiVersion" - implementation "org.apache.maven:maven-plugin-api:$mavenPluginApiVersion" - compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenPluginToolsVersion" - implementation "io.github.microutils:kotlin-logging:$kotlinLoggingVersion" - - implementation "org.eclipse.sisu:org.eclipse.sisu.plexus:$sisuPlexusVersion" - testImplementation "org.apache.maven.plugin-testing:maven-plugin-testing-harness:$mavenPluginTestingVersion" - testImplementation "org.apache.maven:maven-compat:$mavenPluginApiVersion" - testImplementation "org.apache.maven.resolver:maven-resolver-api:$mavenResolverApiVersion" - - mavenEmbedder "org.apache.maven:maven-embedder:$mavenPluginApiVersion" - mavenEmbedder "org.apache.maven:maven-compat:$mavenPluginApiVersion" - mavenEmbedder "org.slf4j:slf4j-simple:$slf4jVersion" - mavenEmbedder "org.eclipse.aether:aether-connector-basic:$eclipseAetherVersion" - mavenEmbedder "org.eclipse.aether:aether-transport-wagon:$eclipseAetherVersion" - mavenEmbedder "org.apache.maven.wagon:wagon-http:$mavenWagonVersion" - mavenEmbedder "org.apache.maven.wagon:wagon-provider-api:$mavenWagonVersion" + implementation group: 'org.apache.maven', name: 'maven-core', version: mavenPluginApiVersion + implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: mavenPluginApiVersion + compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: mavenPluginToolsVersion + implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion + + implementation group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.plexus', version: sisuPlexusVersion + testImplementation group: 'org.apache.maven.plugin-testing', name: 'maven-plugin-testing-harness', version: mavenPluginTestingVersion + testImplementation group: 'org.apache.maven', name: 'maven-compat', version: mavenPluginApiVersion + testImplementation group: 'org.apache.maven.resolver', name: 'maven-resolver-api', version: mavenResolverApiVersion + + mavenEmbedder group: 'org.apache.maven', name: 'maven-embedder', version: mavenPluginApiVersion + mavenEmbedder group: 'org.apache.maven', name: 'maven-compat', version: mavenPluginApiVersion + mavenEmbedder group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion + mavenEmbedder group: 'org.eclipse.aether', name: 'aether-connector-basic', version: eclipseAetherVersion + mavenEmbedder group: 'org.eclipse.aether', name: 'aether-transport-wagon', version: eclipseAetherVersion + mavenEmbedder group: 'org.apache.maven.wagon', name: 'wagon-http', version: mavenWagonVersion + mavenEmbedder group: 'org.apache.maven.wagon', name: 'wagon-provider-api', version: mavenWagonVersion } /** diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts index 5bde292b12..7e3770f76e 100644 --- a/utbot-python/build.gradle.kts +++ b/utbot-python/build.gradle.kts @@ -1,7 +1,12 @@ val intellijPluginVersion: String? by rootProject + val kotlinLoggingVersion: String? by rootProject val apacheCommonsTextVersion: String? by rootProject -val jacksonVersion: String? by rootProject +val apacheCommonsLangVersion: String? by rootProject +val commonsIoVersion: String? by rootProject +val moshiVersion: String? by rootProject +val functionaljavaVersion: String? by rootProject + val ideType: String? by rootProject val pythonCommunityPluginVersion: String? by rootProject val pythonUltimatePluginVersion: String? by rootProject @@ -23,18 +28,25 @@ tasks { dependencies { api(project(":utbot-fuzzers")) api(project(":utbot-framework")) - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation(group = "org.apache.commons", name = "commons-lang3", version = "3.12.0") - implementation(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") - implementation(group = "commons-io", name = "commons-io", version = "2.11.0") - implementation("com.beust:klaxon:5.5") - implementation("com.squareup.moshi:moshi:1.11.0") - implementation("com.squareup.moshi:moshi-kotlin:1.11.0") - implementation("com.squareup.moshi:moshi-adapters:1.11.0") - implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) - implementation("org.functionaljava:functionaljava:5.0") - implementation("org.functionaljava:functionaljava-quickcheck:5.0") - implementation("org.functionaljava:functionaljava-java-core:5.0") + implementation(group = "commons-io", name = "commons-io", version = commonsIoVersion) + implementation(group = "org.apache.commons", name = "commons-lang3", version = apacheCommonsLangVersion) implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) -} \ No newline at end of file + implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) + + api(group = "org.functionaljava", name = "functionaljava", version = functionaljavaVersion) + api(group = "org.functionaljava", name = "functionaljava-quickcheck", version = functionaljavaVersion) + api(group = "org.functionaljava", name = "functionaljava-java-core", version = functionaljavaVersion) + + implementation(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") // TODO: will be changed to javacc21 + implementation("com.beust:klaxon:5.5") // TODO: remove this dependency and use only moshi + + implementation(group = "com.squareup.moshi", name = "moshi", version = moshiVersion) + implementation(group = "com.squareup.moshi", name = "moshi-kotlin", version = moshiVersion) + implementation(group = "com.squareup.moshi", name = "moshi-adapters", version = moshiVersion) +} + +repositories { + mavenCentral() +} diff --git a/utbot-rd/build.gradle b/utbot-rd/build.gradle index ea439435b7..fb57fa3155 100644 --- a/utbot-rd/build.gradle +++ b/utbot-rd/build.gradle @@ -48,14 +48,14 @@ sourceSets { dependencies { implementation project(':utbot-core') - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1' + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion processWithRdServerMockImplementation project(':utbot-rd') - rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: '2022.3.1' + rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: rdFrameworkVersion } task lifetimedProcessMockJar(type: Jar) { diff --git a/utbot-sample/build.gradle b/utbot-sample/build.gradle index ff6f14a543..80ae15edde 100644 --- a/utbot-sample/build.gradle +++ b/utbot-sample/build.gradle @@ -3,14 +3,14 @@ plugins { } dependencies { - implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.2' - implementation group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1' - implementation 'org.projectlombok:lombok:1.18.20' - annotationProcessor 'org.projectlombok:lombok:1.18.20' + implementation group: 'org.jetbrains', name: 'annotations', version: jetbrainsAnnotationsVersion + implementation group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: findbugsAnnotationsVersion + implementation group: 'org.projectlombok', name: 'lombok', version: lombokVersion + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion implementation(project(":utbot-api")) - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - implementation group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final' - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsr305Version + implementation group: 'javax.validation', name: 'validation-api', version: validationApiVersion + implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion } test { diff --git a/utbot-summary/build.gradle.kts b/utbot-summary/build.gradle.kts index e087927bbb..ff1b81e4dc 100644 --- a/utbot-summary/build.gradle.kts +++ b/utbot-summary/build.gradle.kts @@ -3,18 +3,21 @@ val junit4Version: String by rootProject val junit5Version: String by rootProject val sootVersion: String by rootProject val mockitoVersion: String by rootProject +val haifenglSmileVersion: String by rootProject +val javaparserVersion: String by rootProject dependencies { implementation(project(":utbot-framework-api")) - 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(project(":utbot-fuzzers")) implementation(project(":utbot-instrumentation")) - implementation(group = "com.github.haifengl", name = "smile-kotlin", version = "2.6.0") - implementation(group = "com.github.haifengl", name = "smile-core", version = "2.6.0") + + implementation(group = "com.github.haifengl", name = "smile-kotlin", version = haifenglSmileVersion) + implementation(group = "com.github.haifengl", name = "smile-core", version = haifenglSmileVersion) implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) - implementation("com.github.javaparser:javaparser-core:3.22.1") - testImplementation("org.mockito:mockito-core:4.2.0") - testImplementation("org.junit.jupiter:junit-jupiter:$junit5Version") + implementation(group = "com.github.javaparser", name = "javaparser-core", version = javaparserVersion) + testImplementation(group = "org.mockito", name = "mockito-core", version = mockitoVersion) + testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = junit5Version) } diff --git a/utbot-ui-commons/build.gradle.kts b/utbot-ui-commons/build.gradle.kts index cdedf344a8..66a9419cd9 100644 --- a/utbot-ui-commons/build.gradle.kts +++ b/utbot-ui-commons/build.gradle.kts @@ -1,10 +1,14 @@ val kotlinLoggingVersion: String by rootProject val ideType: String by rootProject val ideVersion: String by rootProject + val kotlinPluginVersion: String by rootProject val semVer: String? by rootProject val androidStudioPath: String? by rootProject +val slf4jVersion: String by rootProject +val jetbrainsAnnotationsVersion: String by rootProject + plugins { id("org.jetbrains.intellij") version "1.7.0" } @@ -49,9 +53,10 @@ tasks { } dependencies { - implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) - implementation(group = "org.jetbrains", name = "annotations", version = "16.0.2") implementation(project(":utbot-api")) implementation(project(":utbot-framework")) - implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.25") + + implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) + implementation(group = "org.jetbrains", name = "annotations", version = jetbrainsAnnotationsVersion) + implementation(group = "org.slf4j", name = "slf4j-api", version = slf4jVersion) } From 6d8574b62c2c79785f60db4f48df5bdea24a5cca Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Thu, 10 Nov 2022 11:14:55 +0300 Subject: [PATCH 2/9] Fix apacheCommonsTextVersion --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9f7ae71724..10ae6c029c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,7 +40,7 @@ guavaVersion=30.0-jre commonsIoVersion=2.8.0 apacheCommonsLangVersion=3.11 apacheCommonsExecVersion=1.2 -apacheCommonsTextVersion=1.10 +apacheCommonsTextVersion=1.9 rgxgenVersion=1.3 antlrVersion=4.9.2 kryoVersion=5.3.0 From 626a7089b8343bda014d252ccb7536feb4f6b1b7 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Thu, 10 Nov 2022 11:45:36 +0300 Subject: [PATCH 3/9] Move python dependencies to api --- utbot-python/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts index 7e3770f76e..a6cb26769b 100644 --- a/utbot-python/build.gradle.kts +++ b/utbot-python/build.gradle.kts @@ -39,12 +39,12 @@ dependencies { api(group = "org.functionaljava", name = "functionaljava-quickcheck", version = functionaljavaVersion) api(group = "org.functionaljava", name = "functionaljava-java-core", version = functionaljavaVersion) - implementation(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") // TODO: will be changed to javacc21 - implementation("com.beust:klaxon:5.5") // TODO: remove this dependency and use only moshi + api(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") // TODO: will be changed to javacc21 + api("com.beust:klaxon:5.5") // TODO: remove this dependency and use only moshi - implementation(group = "com.squareup.moshi", name = "moshi", version = moshiVersion) - implementation(group = "com.squareup.moshi", name = "moshi-kotlin", version = moshiVersion) - implementation(group = "com.squareup.moshi", name = "moshi-adapters", version = moshiVersion) + api(group = "com.squareup.moshi", name = "moshi", version = moshiVersion) + api(group = "com.squareup.moshi", name = "moshi-kotlin", version = moshiVersion) + api(group = "com.squareup.moshi", name = "moshi-adapters", version = moshiVersion) } repositories { From caea8dbad58da4758d9b596a1f482d7802cee14e Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Thu, 10 Nov 2022 11:55:53 +0300 Subject: [PATCH 4/9] Remove kotlin dependency from utbot-python --- utbot-python/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts index a6cb26769b..d0382e42dd 100644 --- a/utbot-python/build.gradle.kts +++ b/utbot-python/build.gradle.kts @@ -29,7 +29,6 @@ dependencies { api(project(":utbot-fuzzers")) api(project(":utbot-framework")) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation(group = "commons-io", name = "commons-io", version = commonsIoVersion) implementation(group = "org.apache.commons", name = "commons-lang3", version = apacheCommonsLangVersion) implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) From 2e6f1a98198ca66b13ed40b1c4536e327773f7fe Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Thu, 10 Nov 2022 16:53:02 +0300 Subject: [PATCH 5/9] Remove dependencies --- gradle.properties | 2 +- utbot-js/build.gradle.kts | 2 -- utbot-python/build.gradle.kts | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 10ae6c029c..68e8c6c837 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,7 +47,7 @@ kryoVersion=5.3.0 kryoSerializersVersion=0.45 asmVersion=9.2 testNgVersion=7.6.0 -jacksonVersion = 2.12.3 +jacksonVersion=2.12.3 javasmtSolverZ3Version=4.8.9-sosy1 slf4jVersion=1.7.36 eclipseAetherVersion=1.1.0 diff --git a/utbot-js/build.gradle.kts b/utbot-js/build.gradle.kts index 15ac4cf639..c582a712c4 100644 --- a/utbot-js/build.gradle.kts +++ b/utbot-js/build.gradle.kts @@ -57,6 +57,4 @@ dependencies { implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) api(group = "org.functionaljava", name = "functionaljava", version = functionaljavaVersion) - api(group = "org.functionaljava", name = "functionaljava-quickcheck", version = functionaljavaVersion) - api(group = "org.functionaljava", name = "functionaljava-java-core", version = functionaljavaVersion) } \ No newline at end of file diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts index d0382e42dd..b675f89679 100644 --- a/utbot-python/build.gradle.kts +++ b/utbot-python/build.gradle.kts @@ -5,6 +5,7 @@ val apacheCommonsTextVersion: String? by rootProject val apacheCommonsLangVersion: String? by rootProject val commonsIoVersion: String? by rootProject val moshiVersion: String? by rootProject +val gsonVersion: String? by rootProject val functionaljavaVersion: String? by rootProject val ideType: String? by rootProject @@ -35,8 +36,6 @@ dependencies { implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) api(group = "org.functionaljava", name = "functionaljava", version = functionaljavaVersion) - api(group = "org.functionaljava", name = "functionaljava-quickcheck", version = functionaljavaVersion) - api(group = "org.functionaljava", name = "functionaljava-java-core", version = functionaljavaVersion) api(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") // TODO: will be changed to javacc21 api("com.beust:klaxon:5.5") // TODO: remove this dependency and use only moshi From 738d66c2ea60a8b8a411de73d566f570ebacf1aa Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Mon, 14 Nov 2022 14:58:59 +0300 Subject: [PATCH 6/9] Unify klaxon --- utbot-python/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts index b675f89679..14dbf1fc10 100644 --- a/utbot-python/build.gradle.kts +++ b/utbot-python/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { api(group = "org.functionaljava", name = "functionaljava", version = functionaljavaVersion) api(group = "io.github.danielnaczo", name = "python3parser", version = "1.0.4") // TODO: will be changed to javacc21 - api("com.beust:klaxon:5.5") // TODO: remove this dependency and use only moshi + api(group = "com.beust", name = "klaxon", version = "5.5") // TODO: will be removed and replaced by moshi api(group = "com.squareup.moshi", name = "moshi", version = moshiVersion) api(group = "com.squareup.moshi", name = "moshi-kotlin", version = moshiVersion) From 8faafdaa9755e37894ec26fe87739e005ce32ac5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Mon, 14 Nov 2022 15:23:06 +0300 Subject: [PATCH 7/9] Fix versions after merge --- gradle.properties | 2 ++ utbot-testing/build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 68e8c6c837..8391343840 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,6 +75,7 @@ findbugsJsr305Version=3.0.2 validationApiVersion=2.0.0.Final rdFrameworkVersion=2022.3.1 junitJupiterVersion=5.9.0 +junitJupiterJava8Version=5.8.1 apacheHttpClientVersion=5.1 jsonVersion=20220320 jnaPlatformVersion=5.5.0 @@ -83,6 +84,7 @@ gsonVersion=2.8.9 tablesawVersion=0.38.2 gradlePluginPublishVersion=0.18.0 mockServerNettyVersion=5.4.1 +kotlinSerializationJsonVersion=1.4.1 org.gradle.daemon=false org.gradle.parallel=false diff --git a/utbot-testing/build.gradle b/utbot-testing/build.gradle index 50c4a6f432..82f5e93487 100644 --- a/utbot-testing/build.gradle +++ b/utbot-testing/build.gradle @@ -29,12 +29,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 // testImplementation 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: junitJupiterJava8Version + implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterJava8Version // used for testing code generation testImplementation group: 'commons-io', name: 'commons-io', version: commonsIoVersion From 35b164307c5db3aa258c5619275362da7f6462db Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Mon, 12 Dec 2022 04:33:07 -0800 Subject: [PATCH 8/9] Change rdFrameworkVersion to rdVersion --- gradle.properties | 1 - utbot-framework-api/build.gradle.kts | 6 +++--- utbot-framework/build.gradle | 4 ++-- utbot-instrumentation-tests/build.gradle | 4 ++-- utbot-instrumentation/build.gradle | 4 ++-- utbot-intellij/build.gradle.kts | 4 ++-- utbot-rd/build.gradle | 6 +++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index c3eee32a96..3d2f7b817e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,7 +83,6 @@ findbugsAnnotationsVersion=1.3.9-1 lombokVersion=1.18.20 findbugsJsr305Version=3.0.2 validationApiVersion=2.0.0.Final -rdFrameworkVersion=2022.3.1 junitJupiterVersion=5.9.0 junitJupiterJava8Version=5.8.1 apacheHttpClientVersion=5.1 diff --git a/utbot-framework-api/build.gradle.kts b/utbot-framework-api/build.gradle.kts index c3a6180013..0ab218af6d 100644 --- a/utbot-framework-api/build.gradle.kts +++ b/utbot-framework-api/build.gradle.kts @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar val junit4Version: String by rootProject val sootVersion: String by rootProject val apacheCommonsLangVersion: String by rootProject -val rdFrameworkVersion: String by rootProject +val rdVersion: String by rootProject val kotlinLoggingVersion: String? by rootProject val rdVersion: String? by rootProject @@ -15,8 +15,8 @@ dependencies { api(project(":utbot-core")) api(project(":utbot-api")) api(project(":utbot-rd")) - implementation(group = "com.jetbrains.rd", name = "rd-framework", version = rdFrameworkVersion) - implementation(group = "com.jetbrains.rd", name = "rd-core", version = rdFrameworkVersion) + 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") } diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle index 4ec3c8b48d..e609cb373c 100644 --- a/utbot-framework/build.gradle +++ b/utbot-framework/build.gradle @@ -16,8 +16,8 @@ dependencies { api project(':utbot-framework-api') api project(':utbot-rd') - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion + 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' diff --git a/utbot-instrumentation-tests/build.gradle b/utbot-instrumentation-tests/build.gradle index cc19035530..ba9c9c316b 100644 --- a/utbot-instrumentation-tests/build.gradle +++ b/utbot-instrumentation-tests/build.gradle @@ -9,8 +9,8 @@ dependencies { testImplementation configurations.fetchInstrumentationJar testImplementation project(':utbot-sample') testImplementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion } processResources { diff --git a/utbot-instrumentation/build.gradle b/utbot-instrumentation/build.gradle index e64d6e1237..1e6f1bf8c5 100644 --- a/utbot-instrumentation/build.gradle +++ b/utbot-instrumentation/build.gradle @@ -9,8 +9,8 @@ dependencies { implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryoSerializersVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion + 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: jnaPlatformVersion // TODO: this is necessary for inline classes mocking in UtExecutionInstrumentation diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts index c8efde60b2..907b4565db 100644 --- a/utbot-intellij/build.gradle.kts +++ b/utbot-intellij/build.gradle.kts @@ -99,8 +99,8 @@ tasks { } dependencies { - implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdFrameworkVersion) - implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdFrameworkVersion) + implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdVersion) + implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdVersion) implementation(group ="com.esotericsoftware.kryo", name = "kryo5", version = kryoVersion) implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion) diff --git a/utbot-rd/build.gradle b/utbot-rd/build.gradle index b0b6289ee2..418ff98a5b 100644 --- a/utbot-rd/build.gradle +++ b/utbot-rd/build.gradle @@ -48,15 +48,15 @@ sourceSets { dependencies { implementation project(':utbot-core') - implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdFrameworkVersion - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdFrameworkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdkVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion processWithRdServerMockImplementation project(':utbot-rd') - rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: rdFrameworkVersion + rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: rdVersion } task lifetimedProcessMockJar(type: Jar) { From 7179c8ec6a6a606d3a8f266aa3bae056bc11d2d0 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tamarin Date: Mon, 12 Dec 2022 05:31:00 -0800 Subject: [PATCH 9/9] Fix rdVersion bugs --- utbot-framework-api/build.gradle.kts | 1 - utbot-rd/build.gradle | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/utbot-framework-api/build.gradle.kts b/utbot-framework-api/build.gradle.kts index 0ab218af6d..b60f5f8d13 100644 --- a/utbot-framework-api/build.gradle.kts +++ b/utbot-framework-api/build.gradle.kts @@ -5,7 +5,6 @@ val sootVersion: 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" diff --git a/utbot-rd/build.gradle b/utbot-rd/build.gradle index 418ff98a5b..e6a007b06a 100644 --- a/utbot-rd/build.gradle +++ b/utbot-rd/build.gradle @@ -49,7 +49,7 @@ sourceSets { dependencies { implementation project(':utbot-core') implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion - implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdkVersion + implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion