Modify dependencies for 192 branch: more dependencies to full java plugin

Original commit: b7c12014ee
This commit is contained in:
Nikolay Krasko
2019-06-24 17:36:56 +03:00
parent 9ab1814dd5
commit 96bcadbbba
+6 -12
View File
@@ -25,17 +25,7 @@ dependencies {
includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
} }
} }
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
Platform[191].orLower {
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
}
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testRuntimeOnly(intellijPluginDep("java"))
}
testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":kotlin-reflect-api"))
testCompile(project(":compiler:incremental-compilation-impl")) testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
@@ -43,7 +33,7 @@ dependencies {
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
Ide.IJ { Ide.IJ {
testCompile(intellijDep("devkit")) testCompile(intellijDep("devkit"))
} }
@@ -55,6 +45,10 @@ dependencies {
testRuntime(project(it)) testRuntime(project(it))
} }
Platform[192].orHigher {
testRuntimeOnly(intellijPluginDep("java"))
}
testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-script-runtime")) testRuntime(project(":kotlin-script-runtime"))
} }