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

Build: Fix intellij dependency leak from ir tree module

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-06-02 23:22:50 +03:00
parent 4c91ba90bb
commit 5a39c637c2
38 changed files with 80 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/build.gradle.kts
+2
View File
@@ -15,6 +15,8 @@ dependencies {
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":kotlin-build-common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
runtimeOnly(project(":kotlin-compiler"))
testCompile(commonDep("junit:junit"))
plugins/kapt3/kapt3-cli/build.gradle.kts
+2
View File
@@ -6,6 +6,8 @@ plugins {
dependencies {
compile(project(":compiler:cli"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler"))
testCompile(commonDep("junit:junit"))
plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
}
dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
compile(project(":compiler:plugin-api"))
compile(project(":compiler:frontend"))
plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts
+3
View File
@@ -15,6 +15,9 @@ dependencies {
compileOnly(intellijDep())
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
compileOnly(intellijPluginDep("gradle"))
testCompileOnly(intellijDep())
testRuntimeOnly(intellijDep())
}
sourceSets {
plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
+2 -2
View File
@@ -21,9 +21,9 @@ dependencies {
compile(project(":idea"))
compile(project(":idea:idea-jvm"))
compile(intellijDep()) { includeJars("openapi", "extensions", "util") }
compileOnly(intellijDep()) { includeJars("openapi", "extensions", "util") }
Platform[181].orHigher {
compile(intellijDep()) { includeJars("platform-api") }
compileOnly(intellijDep()) { includeJars("platform-api") }
}
}
plugins/uast-kotlin/build.gradle.kts
+5 -8
View File
@@ -12,11 +12,9 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
Platform[181].orHigher {
// BEWARE: Uast should not depend on IDEA.
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("java-api", "java-impl", "asm-all", rootProject = rootProject) }
}
// BEWARE: Uast should not depend on IDEA.
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":compiler:tests-common"))
@@ -25,9 +23,8 @@ dependencies {
testCompile(project(":compiler:cli"))
testCompile(projectTests(":idea:idea-test-framework"))
Platform[181].orHigher {
testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
}
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
testCompile(project(":idea:idea-native")) { isTransitive = false }
testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }