From 7c3c21790b50e22475ad579782905e6f7cc7c504 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 12 Feb 2019 18:50:11 +0300
Subject: [PATCH] Fix subplugin options for K/N

---
 .../kotlin/gradle/plugin/KotlinTargetConfigurator.kt          | 2 +-
 .../jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index 34092b35ab6..eb37b6e9abb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -397,7 +397,7 @@ open class KotlinNativeTargetConfigurator(
     private fun AbstractKotlinNativeCompile.addCompilerPlugins() {
         SubpluginEnvironment
             .loadSubplugins(project, kotlinPluginVersion)
-            .addSubpluginOptions<CommonCompilerArguments>(project, this, compilerPluginOptions)
+            .addSubpluginOptions(project, this, compilerPluginOptions)
         compilerPluginClasspath = project.configurations.getByName(NATIVE_COMPILER_PLUGIN_CLASSPATH_CONFIGURATION_NAME)
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
index a0f1ed0d4ed..5c82d5538ab 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
@@ -58,7 +58,7 @@ class SubpluginEnvironment(
         kotlinCompilation
     )
 
-    fun <C : CommonCompilerArguments> addSubpluginOptions(
+    fun addSubpluginOptions(
         project: Project,
         kotlinTask: AbstractCompile,
         pluginOptions: CompilerPluginOptions,
@@ -66,7 +66,7 @@ class SubpluginEnvironment(
         variantData: Any? = null,
         androidProjectHandler: AbstractAndroidProjectHandler<out Any?>? = null,
         kotlinCompilation: KotlinCompilation<*>? = null
-    ): List<KotlinGradleSubplugin<AbstractKotlinCompile<C>>> {
+    ): List<KotlinGradleSubplugin<AbstractCompile>> {
         val appliedSubplugins = subplugins.filter { it.isApplicable(project, kotlinTask) }
         for (subplugin in appliedSubplugins) {
             if (!subplugin.isApplicable(project, kotlinTask)) continue