Skip to content

Commit 80bd4f3

Browse files
authored
Fix gradle resolving of guava dependencies, add workaround for #1262 (#1263)
1 parent cb18154 commit 80bd4f3

File tree

8 files changed

+24
-8
lines changed

8 files changed

+24
-8
lines changed

utbot-analytics/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ dependencies {
1414
testImplementation project(':utbot-sample')
1515
testImplementation group: 'junit', name: 'junit', version: junit4Version
1616

17-
implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}"
17+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
18+
exclude group:'com.google.guava', module:'guava'
19+
}
1820
implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0'
1921
implementation group: 'com.github.haifengl', name: 'smile-plot', version: '2.6.0'
2022
implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0'

utbot-framework-api/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ dependencies {
1515
api(project(":utbot-rd"))
1616
implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1")
1717
implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1")
18-
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}")
18+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
19+
exclude(group="com.google.guava", module="guava")
20+
}
1921
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
2022
// TODO do we really need apache commons?
2123
implementation(group = "org.apache.commons", name = "commons-lang3", version = commonsLangVersion)

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,8 @@ enum class CodegenLanguage(
12751275
"--add-exports", "java.base/sun.text=ALL-UNNAMED",
12761276
).plus(sourcesFiles)
12771277

1278-
KOTLIN -> listOf("-d", buildDirectory, "-jvm-target", jvmTarget, "-cp", classPath).plus(sourcesFiles)
1278+
// TODO: -Xskip-prerelease-check is needed to handle #1262, check if this is good enough solution
1279+
KOTLIN -> listOf("-d", buildDirectory, "-jvm-target", jvmTarget, "-cp", classPath, "-Xskip-prerelease-check").plus(sourcesFiles)
12791280
}
12801281
if (this == KOTLIN && System.getenv("KOTLIN_HOME") == null) {
12811282
throw RuntimeException("'KOTLIN_HOME' environment variable is not defined. Standard location is {IDEA installation dir}/plugins/Kotlin/kotlinc")

utbot-framework-test/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ dependencies {
3232
testImplementation project(":utbot-framework").sourceSets.test.output
3333
testImplementation project(":utbot-core").sourceSets.test.output
3434

35-
implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}"
35+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
36+
exclude group:'com.google.guava', module:'guava'
37+
}
3638

3739
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion
3840
implementation group: 'org.sosy-lab', name: 'javasmt-solver-z3', version: javasmtSolverZ3Version

utbot-framework/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ dependencies {
1919
implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
2020
implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
2121

22-
implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}"
22+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
23+
exclude group:'com.google.guava', module:'guava'
24+
}
25+
implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
2326
implementation group: 'com.esotericsoftware.kryo', name: 'kryo5', version: kryoVersion
2427
// this is necessary for serialization of some collections
2528
implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryoSerializersVersion

utbot-fuzzers/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ tasks {
1818
dependencies {
1919
implementation(project(":utbot-framework-api"))
2020

21-
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}")
21+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
22+
exclude(group="com.google.guava", module="guava")
23+
}
2224
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
2325
implementation(group = "com.github.curious-odd-man", name = "rgxgen", version = rgxgenVersion)
2426
}

utbot-junit-contest/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ dependencies {
5252
implementation project(":utbot-framework")
5353
implementation project(":utbot-analytics")
5454

55-
implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}"
55+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
56+
exclude group:'com.google.guava', module:'guava'
57+
}
5658
implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.2'
5759
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
5860
implementation group: 'org.jsoup', name: 'jsoup', version: '1.6.2'

utbot-summary/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ val mockitoVersion: String by rootProject
66

77
dependencies {
88
implementation(project(":utbot-framework-api"))
9-
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}")
9+
implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
10+
exclude(group="com.google.guava", module="guava")
11+
}
1012
implementation(project(":utbot-fuzzers"))
1113
implementation(project(":utbot-instrumentation"))
1214
implementation(group = "com.github.haifengl", name = "smile-kotlin", version = "2.6.0")

0 commit comments

Comments
 (0)