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

Make all dependencies to idea sdk intransitive

Browse Source
This commit is contained in:
Ilya Chernikov
2017-11-24 17:42:06 +01:00
committed by Vyacheslav Gerasimov
parent e76cd802d8
commit a4f28cd94f
65 changed files with 341 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/build.gradle.kts
+2 -2
View File
@@ -25,8 +25,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellij { include("openapi.jar") })
testCompile(intellij { include("idea.jar", "idea_rt.jar", "groovy-all-*.jar", "jps-builders.jar") })
compileOnly(intellij { include("openapi.jar") })
testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "groovy-all-*.jar", "jps-builders.jar") })
testCompile(intellijExtra("jps-standalone") { include("jps-model.jar") })
testCompile(intellijExtra("jps-build-test"))
}
compiler/backend-common/build.gradle.kts
+10
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
@@ -11,6 +15,12 @@ dependencies {
compile(project(":compiler:ir.tree"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
}
sourceSets {
"main" {
projectDefault()
compiler/backend/build.gradle.kts
+11
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:backend-common"))
@@ -13,6 +17,13 @@ dependencies {
compile(project(":compiler:serialization"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") })
}
}
sourceSets {
"main" {
projectDefault()
compiler/build.gradle.kts
+3 -2
View File
@@ -73,9 +73,10 @@ dependencies {
afterEvaluate {
dependencies {
testCompile(intellij { include("openapi.jar", "idea.jar", "util.jar", "asm-all.jar", "commons-httpclient-3.1-patched.jar") })
testCompileOnly(intellijCoreJar())
testCompileOnly(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "util.jar", "asm-all.jar",
"commons-httpclient-3.1-patched.jar") })
testRuntime(intellij())
testRuntime(intellijCoreJar())
}
}
compiler/cli/build.gradle.kts
+2 -2
View File
@@ -34,8 +34,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
}
}
compiler/cli/cli-common/build.gradle.kts
+2 -2
View File
@@ -17,8 +17,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
}
}
compiler/compiler-runner/build.gradle.kts
+10
View File
@@ -7,6 +7,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":kotlin-build-common"))
compileOnly(project(":compiler:cli-common"))
@@ -18,6 +22,12 @@ dependencies {
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/conditional-preprocessor/build.gradle.kts
+2 -2
View File
@@ -19,8 +19,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
}
}
compiler/container/build.gradle.kts
+2 -1
View File
@@ -19,7 +19,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compileOnly(intellijCoreJar())
testCompile(intellijCoreJar())
testRuntime(intellij { include("trove4j.jar") })
}
}
compiler/daemon/build.gradle.kts
+2 -2
View File
@@ -19,8 +19,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
}
}
compiler/daemon/daemon-common/build.gradle.kts
+2 -2
View File
@@ -17,8 +17,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
}
}
compiler/frontend.java/build.gradle.kts
+11
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
@@ -10,6 +14,13 @@ dependencies {
compile(project(":compiler:frontend"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/frontend.script/build.gradle.kts
+10
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
@@ -11,6 +15,12 @@ dependencies {
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/frontend/build.gradle.kts
+11
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
val jflexPath by configurations.creating
dependencies {
@@ -16,6 +20,13 @@ dependencies {
jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("annotations.jar", "trove4j.jar", "guava-*.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/incremental-compilation-impl/build.gradle.kts
+13
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
@@ -19,6 +23,15 @@ dependencies {
testCompile(projectTests(":compiler:tests-common"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("annotations.jar") })
testCompile(intellijCoreJar())
testCompile(intellij { include("annotations.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
compiler/ir/ir.psi2ir/build.gradle.kts
+10
View File
@@ -2,6 +2,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
@@ -9,6 +13,12 @@ dependencies {
compile(project(":compiler:ir.tree"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/light-classes/build.gradle.kts
+11
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:backend"))
@@ -10,6 +14,13 @@ dependencies {
compile(project(":compiler:frontend.java"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/plugin-api/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compileOnly(intellijCoreJar())
}
}
compiler/preloader/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ configureIntellijPlugin()
afterEvaluate {
dependencies {
compile(intellij { include("asm-all.jar") })
compileOnly(intellij { include("asm-all.jar") })
}
}
compiler/resolution/build.gradle.kts
+8
View File
@@ -3,11 +3,19 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin()
dependencies {
compile(project(":compiler:util"))
compile(project(":core:descriptors"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("trove4j.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -35,7 +35,7 @@ dependencies {
afterEvaluate {
dependencies {
testCompile(intellijCoreJar())
testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar") })
testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "guava-*.jar", "trove4j.jar", "picocontainer.jar", "asm-all.jar") })
}
}
compiler/tests-java8/build.gradle.kts
+7
View File
@@ -12,6 +12,13 @@ dependencies {
testRuntime(projectDist(":kotlin-reflect"))
}
afterEvaluate {
dependencies {
testCompileOnly(intellijCoreJar())
testRuntime(intellij())
}
}
sourceSets {
"main" {}
"test" { projectDefault() }
compiler/util/build.gradle.kts
+3 -3
View File
@@ -14,9 +14,9 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
compile(intellijExtra("jps-standalone") { include("jps-model.jar") })
compileOnly(intellijCoreJar())
compileOnly(intellijCoreJarDependencies())
compileOnly(intellijExtra("jps-standalone") { include("jps-model.jar") })
}
}