From 3b322520bde7ea1d349e61d5162925de014bf23f Mon Sep 17 00:00:00 2001
From: ligee <ilya.chernikov@jetbrains.com>
Date: Thu, 23 Jul 2015 20:48:31 +0200
Subject: [PATCH] Using isolated classloader again, but as a singleton; regular
 compiler jar instead of embeddable; more logging (cherry picked from commit
 6801d8a)

---
 libraries/tools/kotlin-gradle-plugin-core/pom.xml             | 2 +-
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
index 62c431995ac..8636d5d7c2a 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler-embeddable</artifactId>
+            <artifactId>kotlin-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
index cb03e49b53c..8c7e18d7ab0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
@@ -35,7 +35,9 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
         project.getExtensions().getExtraProperties()?.set("kotlin.gradle.plugin.version", kotlinPluginVersion)
 
         if (pluginClassLoader == null)
-            pluginClassLoader = createPluginClassLoader(kotlinPluginVersion, sourceBuildScript)
+            pluginClassLoader = createPluginIsolatedClassLoader(kotlinPluginVersion, sourceBuildScript)
+        else
+            log.kotlinDebug("Reusing classloader from previous run")
         val plugin = getPlugin(pluginClassLoader!!, sourceBuildScript)
         plugin.apply(project)