azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Update guava

Browse Source 
Fix some reports from "Show Vulnerable Dependencies"

^KTI-1342
This commit is contained in:
Bogdan Mukvich
2023-08-24 11:57:30 +02:00
committed by Space Team
parent dbb5072a26
commit 7b00323b89
35 changed files with 39 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend.common.jvm/build.gradle.kts
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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"))