From 7b00323b89360f8e172dc5acfaa9ea3be96b2a98 Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Thu, 24 Aug 2023 11:57:30 +0200 Subject: [PATCH] [Build] Update guava Fix some reports from "Show Vulnerable Dependencies" ^KTI-1342 --- .../build.gradle.kts | 2 +- analysis/analysis-api/build.gradle.kts | 2 +- analysis/kt-references/build.gradle.kts | 2 +- .../kt-references-fe10/build.gradle.kts | 2 +- compiler/backend.common.jvm/build.gradle.kts | 2 +- compiler/backend/build.gradle.kts | 2 +- compiler/cli/cli-common/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- compiler/fir/plugin-utils/build.gradle.kts | 2 +- compiler/fir/providers/build.gradle.kts | 2 +- .../raw-fir/light-tree2fir/build.gradle.kts | 2 +- compiler/fir/raw-fir/psi2fir/build.gradle.kts | 2 +- .../raw-fir/raw-fir.common/build.gradle.kts | 2 +- compiler/fir/resolve/build.gradle.kts | 2 +- compiler/fir/semantics/build.gradle.kts | 2 +- compiler/frontend.common/build.gradle.kts | 2 +- compiler/frontend.java/build.gradle.kts | 2 +- compiler/frontend/build.gradle.kts | 2 +- compiler/frontend/cfg/build.gradle.kts | 2 +- compiler/light-classes/build.gradle.kts | 2 +- compiler/psi/build.gradle.kts | 2 +- .../resolution.common.jvm/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- .../tests-compiler-utils/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 +- gradle/verification-metadata.xml | 50 ++----------------- gradle/versions.properties | 1 - js/js.dce/build.gradle.kts | 2 +- js/js.frontend/build.gradle.kts | 2 +- js/js.tests/build.gradle.kts | 2 +- js/js.translator/build.gradle.kts | 2 +- .../jvm-embeddable-host/build.gradle.kts | 2 +- .../kotlin-gradle-plugin/build.gradle.kts | 2 +- plugins/lombok/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 2 +- 35 files changed, 39 insertions(+), 80 deletions(-) diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts index 5b3966cc07e..22828d0fb75 100644 --- a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { the same as it is in `:fir:tree:tree-generator` module to the project be imported correctly */ compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) implementation(project(":compiler:psi")) } diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index 18bbc28e10d..2cd10f81f28 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/analysis/analysis-api/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(intellijCore()) api(commonDependency("org.jetbrains.intellij.deps:asm-all")) - api(commonDependency("com.google.guava:guava")) + api(libs.guava) } kotlin { diff --git a/analysis/kt-references/build.gradle.kts b/analysis/kt-references/build.gradle.kts index b95e00f38e7..9379f2d70ce 100644 --- a/analysis/kt-references/build.gradle.kts +++ b/analysis/kt-references/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { implementation(project(":analysis:analysis-api-providers")) implementation(project(":analysis:project-structure")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/analysis/kt-references/kt-references-fe10/build.gradle.kts b/analysis/kt-references/kt-references-fe10/build.gradle.kts index f44046d1ed8..d2fca524be7 100644 --- a/analysis/kt-references/kt-references-fe10/build.gradle.kts +++ b/analysis/kt-references/kt-references-fe10/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":compiler:frontend.java")) implementation(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/backend.common.jvm/build.gradle.kts b/compiler/backend.common.jvm/build.gradle.kts index fc3b805561e..55c03f29fbd 100644 --- a/compiler/backend.common.jvm/build.gradle.kts +++ b/compiler/backend.common.jvm/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":core:compiler.common.jvm")) api(project(":compiler:config.jvm")) api(commonDependency("org.jetbrains.intellij.deps:asm-all")) - api(commonDependency("com.google.guava:guava")) + api(libs.guava) compileOnly(intellijCore()) } diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index f3b3a69c6ca..d2433b6498a 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index fb3862b075a..665f7ce8cc1 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(project(":compiler:plugin-api")) compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) } diff --git a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts index 41c3de35554..66b869f7d28 100644 --- a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts +++ b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { the same as it is in `:fir:tree:tree-generator` module to the project be imported correctly */ compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) implementation(project(":compiler:psi")) } diff --git a/compiler/fir/plugin-utils/build.gradle.kts b/compiler/fir/plugin-utils/build.gradle.kts index 6438c85a2d8..47d64ce0f93 100644 --- a/compiler/fir/plugin-utils/build.gradle.kts +++ b/compiler/fir/plugin-utils/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":compiler:fir:semantics")) implementation(project(":core:util.runtime")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/fir/providers/build.gradle.kts b/compiler/fir/providers/build.gradle.kts index 8d08c8f8d74..15731020788 100644 --- a/compiler/fir/providers/build.gradle.kts +++ b/compiler/fir/providers/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(project(":compiler:fir:tree")) implementation(project(":core:util.runtime")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index 756501cff50..16ac8804e3c 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation(kotlinxCollectionsImmutable()) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) testImplementation(commonDependency("junit:junit")) testImplementation(projectTests(":compiler:tests-common")) diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index 7d4985862ed..e67d80c64a7 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { implementation(kotlinxCollectionsImmutable()) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) testImplementation(commonDependency("junit:junit")) testImplementation(projectTests(":compiler:tests-common")) diff --git a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts index 9f45cbe631b..35c8403b6de 100644 --- a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts +++ b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation(project(":compiler:psi")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) testCompileOnly(intellijCore()) testRuntimeOnly(intellijCore()) diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts index ccf27bcf0ed..91c7c78bb9d 100644 --- a/compiler/fir/resolve/build.gradle.kts +++ b/compiler/fir/resolve/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(project(":compiler:fir:semantics")) implementation(project(":core:util.runtime")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/fir/semantics/build.gradle.kts b/compiler/fir/semantics/build.gradle.kts index 02ad7de9f9f..739d2a67521 100644 --- a/compiler/fir/semantics/build.gradle.kts +++ b/compiler/fir/semantics/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":compiler:fir:providers")) implementation(project(":core:util.runtime")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/frontend.common/build.gradle.kts b/compiler/frontend.common/build.gradle.kts index 179df840a88..0ac8992dfcd 100644 --- a/compiler/frontend.common/build.gradle.kts +++ b/compiler/frontend.common/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":compiler:config")) api(project(":compiler:container")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index f24e5289354..7f981167786 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index a1e73baa30b..9ba2433dabe 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { api(commonDependency("io.javaslang","javaslang")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/frontend/cfg/build.gradle.kts b/compiler/frontend/cfg/build.gradle.kts index da7d0d28730..a92f3737934 100644 --- a/compiler/frontend/cfg/build.gradle.kts +++ b/compiler/frontend/cfg/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":compiler:frontend")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 42f2e65339f..2948751f097 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts index 6cf865be0f9..cfd68bfc8aa 100644 --- a/compiler/psi/build.gradle.kts +++ b/compiler/psi/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":kotlin-script-runtime")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) jflexPath(commonDependency("org.jetbrains.intellij.deps.jflex", "jflex")) diff --git a/compiler/resolution.common.jvm/build.gradle.kts b/compiler/resolution.common.jvm/build.gradle.kts index 3e6a12897f4..48722848892 100644 --- a/compiler/resolution.common.jvm/build.gradle.kts +++ b/compiler/resolution.common.jvm/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 26eb94e8396..8e5052d9a49 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { testApi(jpsModelImpl()) { isTransitive = false } testApi(intellijJavaRt()) - testImplementation(commonDependency("com.google.guava:guava")) + testImplementation(libs.guava) testImplementation(commonDependency("org.jetbrains.intellij.deps:trove4j")) testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all")) testImplementation(commonDependency("org.jetbrains.intellij.deps:log4j")) diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts index 04b1caa1805..bff0332ee54 100644 --- a/compiler/tests-compiler-utils/build.gradle.kts +++ b/compiler/tests-compiler-utils/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testApi(commonDependency("com.android.tools:r8")) testCompileOnly(intellijCore()) - testApi(commonDependency("com.google.guava:guava")) + testApi(libs.guava) testApi(commonDependency("org.jetbrains.intellij.deps:trove4j")) testApi(commonDependency("org.jetbrains.intellij.deps:asm-all")) testApi(commonDependency("org.jetbrains.intellij.deps:log4j")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98b87e1fbaf..8cc2da91668 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ gradle-enterprise = "3.13.4" gradle-plugin-publish = "1.0.0" # Version for foojay should be also synced with version in repo/gradle-settings-conventions/settings.gradle.kts gradle-toolchains-foojay-resolver = "0.4.0" +guava = "31.1-jre" jdom2 = "2.0.6.1" kotlinx-serialization = "1.5.0" shadow = "8.1.1" # Should be in sync with version in kotlin-native/ @@ -36,14 +37,15 @@ ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" } ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" } +ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor" } ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" } ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" } ktor-server-test-host = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" } -ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor" } jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" } jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } jetbrains-ideaExt-gradlePlugin = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "jetbrains-ideaExt" } jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6700a6a34e6..e4ee7c9f053 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -922,12 +922,6 @@ - - - - - - @@ -970,12 +964,6 @@ - - - - - - @@ -1006,12 +994,6 @@ - - - - - - @@ -3290,10 +3272,10 @@ - - - - + + + + @@ -3960,12 +3942,6 @@ - - - - - - @@ -3996,24 +3972,12 @@ - - - - - - - - - - - - @@ -4050,12 +4014,6 @@ - - - - - - diff --git a/gradle/versions.properties b/gradle/versions.properties index 64b7f891489..41177df90c5 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -11,7 +11,6 @@ versions.groovy-xml=2.5.11 versions.groovy=2.5.11 # should be in sync with libs.versions.toml versions.gson=2.8.9 -versions.guava=32.0.1-jre versions.intellij-deps-fastutil=8.5.4-9 versions.jdom=2.0.6 versions.jna-platform=5.9.0.26 diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts index 7b9804beb26..43295acb43b 100644 --- a/js/js.dce/build.gradle.kts +++ b/js/js.dce/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(project(":js:js.translator")) compileOnly(project(":js:js.sourcemap")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts index 4b0c6359620..3dbedbbb6e5 100644 --- a/js/js.frontend/build.gradle.kts +++ b/js/js.frontend/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(project(":js:js.serializer")) api(project(":js:js.config")) compileOnly(intellijCore()) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index ebc1733029d..79f46bfd2df 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { testApi(project(":compiler:util")) testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - testRuntimeOnly(commonDependency("com.google.guava:guava")) + testRuntimeOnly(libs.guava) testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:jdom")) testRuntimeOnly(kotlinStdlib()) diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts index d6440f4c646..b13dc6edbeb 100644 --- a/js/js.translator/build.gradle.kts +++ b/js/js.translator/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compileOnly(project(":js:js.sourcemap")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) - compileOnly(commonDependency("com.google.guava:guava")) + compileOnly(libs.guava) } sourceSets { diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts index 09ec3499259..83a92b898cf 100644 --- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { testRuntimeOnly(project(":kotlin-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-jvm-host")) - testRuntimeOnly(commonDependency("com.google.guava:guava")) + testRuntimeOnly(libs.guava) testApi(commonDependency("junit")) } diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 46bb2fa313c..e5579464b84 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -121,7 +121,7 @@ dependencies { embedded(project(":kotlin-gradle-statistics")) embedded(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false } embedded(commonDependency("com.google.code.gson:gson")) { isTransitive = false } - embedded(commonDependency("com.google.guava:guava")) { isTransitive = false } + embedded(libs.guava) { isTransitive = false } embedded(commonDependency("org.jetbrains.teamcity:serviceMessages")) { isTransitive = false } embedded(project(":kotlin-tooling-metadata")) { isTransitive = false } embedded("de.undercouch:gradle-download-task:4.1.1") diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts index 70d7673adc8..a2a5d1b62ec 100644 --- a/plugins/lombok/build.gradle.kts +++ b/plugins/lombok/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testApi(commonDependency("junit:junit")) - testRuntimeOnly(commonDependency("com.google.guava:guava")) + testRuntimeOnly(libs.guava) testRuntimeOnly(commonDependency("org.codehaus.woodstox:stax2-api")) testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml")) testRuntimeOnly(toolsJar()) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index ac68da46cac..1f6f0c94c1b 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -239,7 +239,7 @@ dependencies { fatJarContents(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) { isTransitive = false } fatJarContents(commonDependency("org.lz4:lz4-java")) { isTransitive = false } fatJarContents(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false } - fatJarContents(commonDependency("com.google.guava:guava")) { isTransitive = false } + fatJarContents(libs.guava) { isTransitive = false } //Gson is needed for kotlin-build-statistics. Build statistics could be enabled for JPS and Gradle builds. Gson will come from inteliij or KGP. proguardLibraries(commonDependency("com.google.code.gson:gson")) { isTransitive = false}