azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle: Remove logger argument in SubpluginEnvironment

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-04 17:47:20 +03:00
parent c2073cb575
commit b9bfc659d5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4 -5
View File
@@ -483,18 +483,17 @@ private fun loadSubplugins(project: Project, logger: Logger): SubpluginEnvironme
subpluginClasspaths.put(subplugin, files) subpluginClasspaths.put(subplugin, files)
} }
return SubpluginEnvironment(subpluginClasspaths, subplugins, logger) return SubpluginEnvironment(subpluginClasspaths, subplugins)
} catch (e: NoClassDefFoundError) { } catch (e: NoClassDefFoundError) {
// Skip plugin loading if KotlinGradleSubplugin is not defined. // Skip plugin loading if KotlinGradleSubplugin is not defined.
// It is true now for tests in kotlin-gradle-plugin-core. // It is true now for tests in kotlin-gradle-plugin-core.
return SubpluginEnvironment(mapOf(), listOf(), logger) return SubpluginEnvironment(mapOf(), listOf())
} }
} }
private class SubpluginEnvironment( private class SubpluginEnvironment(
val subpluginClasspaths: Map<KotlinGradleSubplugin, List<String>>, val subpluginClasspaths: Map<KotlinGradleSubplugin, List<String>>,
val subplugins: List<KotlinGradleSubplugin>, val subplugins: List<KotlinGradleSubplugin>
val logger: Logger
) { ) {
fun addSubpluginArguments(project: Project, compileTask: AbstractCompile) { fun addSubpluginArguments(project: Project, compileTask: AbstractCompile) {
@@ -506,7 +505,7 @@ private class SubpluginEnvironment(
val args = subplugin.getExtraArguments(project, compileTask) val args = subplugin.getExtraArguments(project, compileTask)
with (subplugin) { with (subplugin) {
logger.kotlinDebug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.") project.getLogger().kotlinDebug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.")
} }
val subpluginClasspath = subpluginClasspaths[subplugin] val subpluginClasspath = subpluginClasspaths[subplugin]