[Build] Update guava

Fix some reports from "Show Vulnerable Dependencies"

^KTI-1342

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"))
 }

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 {

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 {

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 {

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())
 }
 

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 {

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"))
 }
 

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"))
 }

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 {

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 {

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"))

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"))

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())

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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"))

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 {

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"))

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"))

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" }
 

gradle/verification-metadata.xml

@@ -922,12 +922,6 @@
             <sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
-         <artifact name="error_prone_annotations-2.18.0.jar">
-            <md5 value="64145d0e7fee5a69ed7b84cf402de998" origin="Generated by Gradle"/>
-            <sha256 value="9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.jar">
             <md5 value="67beeee58df00366100061c7da82f4c2" origin="Generated by Gradle"/>
@@ -970,12 +964,6 @@
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.guava" name="guava" version="32.0.1-jre">
-         <artifact name="guava-32.0.1-jre.jar">
-            <md5 value="6951895e804b36322214c95917e598d4" origin="Generated by Gradle"/>
-            <sha256 value="bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.guava" name="listenablefuture" version="9999.0-empty-to-avoid-conflict-with-guava">
          <artifact name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
             <md5 value="d094c22570d65e132c19cea5d352e381" origin="Generated by Gradle"/>
@@ -1006,12 +994,6 @@
             <sha256 value="21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.j2objc" name="j2objc-annotations" version="2.8">
-         <artifact name="j2objc-annotations-2.8.jar">
-            <md5 value="c50af69b704dc91050efb98e0dff66d1" origin="Generated by Gradle"/>
-            <sha256 value="f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.jimfs" name="jimfs" version="1.1">
          <artifact name="jimfs-1.1.jar">
             <md5 value="2a66dd6ae1115e7547be594d52ea7546" origin="Generated by Gradle"/>
@@ -3290,10 +3272,10 @@
             <sha256 value="ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.checkerframework" name="checker-qual" version="3.33.0">
-         <artifact name="checker-qual-3.33.0.jar">
-            <md5 value="fc9418b779d9d57dcd52197006cbdb9b" origin="Generated by Gradle"/>
-            <sha256 value="e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1" origin="Generated by Gradle"/>
+      <component group="org.checkerframework" name="checker-qual" version="3.19.0">
+         <artifact name="checker-qual-3.19.0.jar">
+            <md5 value="a70912824bb142a53d6cb50a349dab1a" origin="Generated by Gradle"/>
+            <sha256 value="a827c49183f3a632277d27a0a4673686cb341507447b9d570261094bd748aa68" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.checkerframework" name="checker-qual" version="3.5.0">
@@ -3960,12 +3942,6 @@
             <sha256 value="4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.5.0">
-         <artifact name="kotlin-stdlib-common-1.5.0.jar">
-            <md5 value="df18df1862c2fd6b5c185c8eeb493dc1" origin="Generated by Gradle"/>
-            <sha256 value="c14ce6720a487b5e238f1b0c30ac3ad73e45b90a40731ca0b1cfddec1a37682f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.5.31">
          <artifact name="kotlin-stdlib-common-1.5.31.jar">
             <md5 value="65557bf9158d26bb450352376584b0b8" origin="Generated by Gradle"/>
@@ -3996,24 +3972,12 @@
             <sha256 value="fa20188abaa8ecf1d0035e93a969b071f10e45a1c8378c314521eade73f75fd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.22">
-         <artifact name="kotlin-stdlib-common-1.8.22.jar">
-            <md5 value="cd121f14e612ec4a897a47b96566da07" origin="Generated by Gradle"/>
-            <sha256 value="d0c2365e2437ef70f34586d50f055743f79716bcfe65e4bc7239cdd2669ef7c5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.31">
          <artifact name="kotlin-stdlib-jdk7-1.4.31.jar">
             <md5 value="b471182f952997b2ed62911d28321c7a" origin="Generated by Gradle"/>
             <sha256 value="1f966e54e86cf4b7d7014afdce04e0f3ee4625084cda3494edccc7b84af52664" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.5.0">
-         <artifact name="kotlin-stdlib-jdk7-1.5.0.jar">
-            <md5 value="fd0b328765bf0928834f0dd976ce0dd2" origin="Generated by Gradle"/>
-            <sha256 value="ac12f092f12b575c1f9e0ab5025b1e610b0fe95663e26371c16c328895711bae" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.5.31">
          <artifact name="kotlin-stdlib-jdk7-1.5.31.jar">
             <md5 value="ce797b26bf08539083989677cdcdb957" origin="Generated by Gradle"/>
@@ -4050,12 +4014,6 @@
             <sha256 value="b2f8364435ebcb0106ff9d4415a11ffdef8ec7786ee6e5ed465a01556cbd1683" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.5.0">
-         <artifact name="kotlin-stdlib-jdk8-1.5.0.jar">
-            <md5 value="ef1d81c51ea952200016025b51b73999" origin="Generated by Gradle"/>
-            <sha256 value="15e6c81b9e845eefe58d51a04670bb90418046f458264ec0e61ee9bdbc1bfae7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.5.31">
          <artifact name="kotlin-stdlib-jdk8-1.5.31.jar">
             <md5 value="294e940f7b51c2c26611dc1f237eecc3" origin="Generated by Gradle"/>

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

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 {

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 {

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())

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 {

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"))
 }
 

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")

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())

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}