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

Build: remove intellijCore/annotations.jar usages

Browse Source
This commit is contained in:
Sergey Rostov
2019-01-23 14:45:25 +03:00
parent c716ef112e
commit 0f2fb4ff82
33 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compileOnly(project(":js:js.serializer"))
compileOnly(project(":js:js.frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) }
compileOnly(project(":kotlin-reflect-api"))
testCompileOnly(project(":compiler:cli-common"))
build.gradle.kts
+1 -2
View File
@@ -186,8 +186,7 @@ extra["intellijUltimateEnabled"] = intellijUltimateEnabled
extra["intellijSeparateSdks"] = intellijSeparateSdks
extra["IntellijCoreDependencies"] =
listOf("annotations",
if (Platform[191].orHigher()) "asm-all-7.0" else "asm-all",
listOf(if (Platform[191].orHigher()) "asm-all-7.0" else "asm-all",
"guava",
"jdom",
"jna",
compiler/backend/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:serialization"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations", "asm-all", rootProject = rootProject) }
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
}
sourceSets {
compiler/compiler.pro
+4
View File
@@ -52,6 +52,10 @@ messages/**)
-dontwarn com.intellij.util.io.TarUtil
-dontwarn com.intellij.util.io.Compressor$Tar
# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations
-dontwarn org.jetbrains.annotations.Async*
-dontwarn org.jetbrains.annotations.Nls$Capitalization
# Nullability annotations used in Guava
-dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl
-dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl
compiler/compiler.pro.181
+4
View File
@@ -51,6 +51,10 @@ messages/**)
-dontwarn org.jetbrains.annotations.Mutable
-dontwarn com.intellij.util.io.TarUtil
# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations
-dontwarn org.jetbrains.annotations.Async*
-dontwarn org.jetbrains.annotations.Nls$Capitalization
# Depends on apache batik which has lots of dependencies
-dontwarn com.intellij.util.SVGLoader*
compiler/compiler.pro.191
+4
View File
@@ -53,6 +53,10 @@ messages/**)
-dontwarn com.intellij.util.io.TarUtil
-dontwarn com.intellij.util.io.Compressor$Tar
# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations
-dontwarn org.jetbrains.annotations.Async*
-dontwarn org.jetbrains.annotations.Nls$Capitalization
# Nullability annotations used in Guava
-dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl
-dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl
compiler/compiler.pro.as32
+4
View File
@@ -52,6 +52,10 @@ messages/**)
-dontwarn org.jetbrains.annotations.Mutable
-dontwarn com.intellij.util.io.TarUtil
# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations
-dontwarn org.jetbrains.annotations.Async*
-dontwarn org.jetbrains.annotations.Nls$Capitalization
# Depends on apache batick which has lots of dependencies
-dontwarn com.intellij.util.SVGLoader*
compiler/compiler.pro.as34
+4
View File
@@ -53,6 +53,10 @@ messages/**)
-dontwarn com.intellij.util.io.TarUtil
-dontwarn com.intellij.util.io.Compressor$Tar
# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations
-dontwarn org.jetbrains.annotations.Async*
-dontwarn org.jetbrains.annotations.Nls$Capitalization
# Nullability annotations used in Guava
-dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl
-dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl
compiler/fir/cones/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
compiler/fir/java/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":compiler:fir:resolve"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
compiler/fir/psi2fir/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
compile(project(":compiler:fir:tree"))
compile(project(":compiler:ir.tree"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijDep())
compiler/fir/resolve/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
compile(project(":compiler:fir:cones"))
compile(project(":compiler:fir:tree"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
compiler/fir/tree/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
compile(project(":compiler:fir:cones"))
compile(project(":compiler:ir.tree"))
// Necessary only to store bound PsiElement inside FirElement
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
compiler/fir/tree/visitors-generator/build.gradle.kts
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile(intellijCoreDep()) { includeJars("intellij-core") }
compile(intellijDep()) {
includeJars("trove4j", "picocontainer", "annotations", rootProject = rootProject)
includeJars("trove4j", "picocontainer", rootProject = rootProject)
isTransitive = false
}
compile(intellijDep()) { includeJars("guava", rootProject = rootProject) }
compiler/frontend.common/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
dependencies {
compile(project(":compiler:psi"))
compile(project(":compiler:container"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
compiler/frontend.java/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
}
compile(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/frontend/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
compile(project(":kotlin-script-runtime"))
compile(commonDep("io.javaslang","javaslang"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/incremental-compilation-impl/build.gradle.kts
+1 -2
View File
@@ -17,7 +17,6 @@ dependencies {
compile(project(":kotlin-build-common"))
compile(project(":compiler:daemon-common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations") }
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
@@ -26,7 +25,7 @@ dependencies {
testCompile(projectTests(":kotlin-build-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) { includeJars("annotations", "log4j", "jdom") }
testCompile(intellijDep()) { includeJars("log4j", "jdom") }
}
sourceSets {
compiler/ir/backend.jvm/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
compile(project(":compiler:ir.tree"))
compile(project(":compiler:ir.psi2ir"))
compile(project(":compiler:ir.backend.common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations", "asm-all", rootProject = rootProject) }
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
}
sourceSets {
compiler/light-classes/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/psi/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":kotlin-script-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -36,7 +36,7 @@ dependencies {
testCompile(androidDxJar()) { isTransitive = false }
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) {
includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", rootProject = rootProject)
isTransitive = false
}
}
idea/fir-view/build.gradle.kts
+2 -2
View File
@@ -20,8 +20,8 @@ dependencies {
compile(project(":idea:idea-core"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijPluginDep("gradle")) //{ includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}
idea/ide-common/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":js:js.frontend"))
compile(project(":js:js.serializer"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep())
}
idea/idea-core/build.gradle.kts
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
compile(project(":kotlin-scripting-compiler"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) {
Ide.IJ191.orHigher {
this@compileOnly.includeJars("platform-api")
js/js.ast/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j") }
}
js/js.dce/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":js:js.ast"))
compile(project(":js:js.translator"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
js/js.frontend/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compile(project(":js:js.ast"))
compile(project(":js:js.parser"))
compile(project(":js:js.serializer"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
}
js/js.parser/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
dependencies {
compile(project(":compiler:util"))
compile(project(":js:js.ast"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
js/js.serializer/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:serialization"))
compile(project(":js:js.ast"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
js/js.tests/build.gradle.kts
+1 -1
View File
@@ -23,7 +23,7 @@ dependencies {
testCompileOnly(project(":compiler:frontend"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":compiler:util"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
testCompile(project(":compiler:backend.js"))
testCompile(project(":js:js.translator"))
js/js.translator/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
compile(project(":js:js.ast"))
compile(project(":js:js.frontend"))
compile(project(":js:js.parser"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
}
ultimate/build.gradle.kts
+2 -2
View File
@@ -44,7 +44,7 @@ dependencies {
if (intellijUltimateEnabled) {
compileOnly(intellijUltimatePluginDep("NodeJS"))
compileOnly(intellijUltimateDep()) { includeJars("annotations", "trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") }
compileOnly(intellijUltimateDep()) { includeJars("trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") }
compileOnly(intellijUltimatePluginDep("CSS"))
compileOnly(intellijUltimatePluginDep("DatabaseTools"))
compileOnly(intellijUltimatePluginDep("JavaEE"))
@@ -76,7 +76,7 @@ dependencies {
testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
if (intellijUltimateEnabled) {
testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "annotations", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) }
testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) }
}
testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }