From 556287f9bb2d0d55dc93ed7b3554689dd7541f7e Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 8 Nov 2017 11:41:27 +0100
Subject: [PATCH] Move idea plugin artifacts one dir deeper to simplify runIde
 task

Running idea via specifying plugins dir (instead of plugin.path property
allow idea to select proper plugin version without a need to remove a bundled
plugin. But in order to make it work, the regular and ultimate plugins
should have separate parent dirs.
---
 TeamCityBuild.xml | 2 +-
 build.gradle.kts  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index a83a565137c..d7146ef0ae5 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -6,7 +6,7 @@
 
     <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
 
-    <property name="artifact.output.path" value="${basedir}/dist/artifacts"/>
+    <property name="artifact.output.path" value="${basedir}/dist/artifacts/ideaPlugin"/>
     <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
     <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
     <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
diff --git a/build.gradle.kts b/build.gradle.kts
index b346e480abb..5092305770b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,8 +79,8 @@ val commonBuildDir = File(rootDir, "build")
 val distDir = "$rootDir/dist"
 val distKotlinHomeDir = "$distDir/kotlinc"
 val distLibDir = "$distKotlinHomeDir/lib"
-val ideaPluginDir = "$distDir/artifacts/Kotlin"
-val ideaUltimatePluginDir = "$distDir/artifacts/KotlinUltimate"
+val ideaPluginDir = "$distDir/artifacts/ideaPlugin/Kotlin"
+val ideaUltimatePluginDir = "$distDir/artifacts/ideaUltimatePlugin/Kotlin"
 
 extra["distDir"] = distDir
 extra["distKotlinHomeDir"] = distKotlinHomeDir