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>, - val subplugins: List, - val logger: Logger + val subplugins: List ) { 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]