From bb17724f96ff5af1bc2a82bca16a75e1e1d1c6ae Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 10 Sep 2015 11:04:40 +0300
Subject: [PATCH] Gradle: workaround the problem that getVariantDataManager is
 internal

---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt       | 3 ++-
 .../kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 fa7f8c47c82..805e1b8ab6d 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
@@ -326,7 +326,8 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
                 val plugin = (project.getPlugins().findPlugin("android")
                                 ?: project.getPlugins().findPlugin("android-library")) as BasePlugin
 
-                processVariantData(plugin.getVariantManager().getVariantDataList(), project,
+                val variantManager = AndroidGradleWrapper.getVariantDataManager(plugin)
+                processVariantData(variantManager.getVariantDataList(), project,
                         ext, plugin, aptConfigurations)
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
index 8b5184148f8..d74ea6a739a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
@@ -5,6 +5,7 @@ import com.android.build.gradle.BasePlugin
 import com.android.build.gradle.api.ApkVariant
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.api.TestVariant
+import com.android.build.gradle.internal.VariantManager
 import org.gradle.api.internal.DefaultDomainObjectSet
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.util.PatternFilterable
@@ -87,4 +88,8 @@ class AndroidGradleWrapper {
     }
     return list
   }
+
+  static def VariantManager getVariantDataManager(BasePlugin plugin) {
+    return plugin.getVariantManager()
+  }
 }