From 9ab1814dd5faf0e3c2478c3d256848fd1e9b9372 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 20 Jun 2019 15:21:58 +0300 Subject: [PATCH] Update to 192.5118.30 Original commit: beb1bc09d40722ae4873624b9091966f8527125f --- jps/jps-plugin/build.gradle.kts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index 2ffe1efb648..9587501a2c3 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -25,7 +25,17 @@ dependencies { 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")) testCompile(project(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:tests-common")) @@ -33,7 +43,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) - testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } + Ide.IJ { testCompile(intellijDep("devkit")) }