From b9bfc659d51196ec3d1a399809f9557318fcd99f Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 4 Jun 2015 17:47:20 +0300
Subject: [PATCH] Gradle: Remove logger argument in SubpluginEnvironment

---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index e7c6d71a9d5..9a8884661f9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -483,18 +483,17 @@ private fun loadSubplugins(project: Project, logger: Logger): SubpluginEnvironme
             subpluginClasspaths.put(subplugin, files)
         }
 
-        return SubpluginEnvironment(subpluginClasspaths, subplugins, logger)
+        return SubpluginEnvironment(subpluginClasspaths, subplugins)
     } catch (e: NoClassDefFoundError) {
         // Skip plugin loading if KotlinGradleSubplugin is not defined.
         // It is true now for tests in kotlin-gradle-plugin-core.
-        return SubpluginEnvironment(mapOf(), listOf(), logger)
+        return SubpluginEnvironment(mapOf(), listOf())
     }
 }
 
 private class SubpluginEnvironment(
     val subpluginClasspaths: Map<KotlinGradleSubplugin, List<String>>,
-    val subplugins: List<KotlinGradleSubplugin>,
-    val logger: Logger
+    val subplugins: List<KotlinGradleSubplugin>
 ) {
 
     fun addSubpluginArguments(project: Project, compileTask: AbstractCompile) {
@@ -506,7 +505,7 @@ private class SubpluginEnvironment(
             val args = subplugin.getExtraArguments(project, compileTask)
 
             with (subplugin) {
-                logger.kotlinDebug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.")
+                project.getLogger().kotlinDebug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.")
             }
 
             val subpluginClasspath = subpluginClasspaths[subplugin]