From fa84783414c9ee5d3aa20a1ac1e68b2cc83f447b Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Wed, 21 Aug 2013 15:41:28 +0400
Subject: [PATCH] fix for http://youtrack.jetbrains.com/issue/KT-3911

---
 .../org/gradle/api/plugins/annotations.xml    | 49 ++++++++++---------
 .../kotlin/gradle/plugin/KotlinPlugin.kt      |  4 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml
index fb08bfa4358..7e2d6dea446 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-  <item name="org.gradle.api.plugins.Convention T getPlugin(java.lang.Class&lt;T&gt;)">
-    <annotation name="org.jetbrains.annotations.NotNull" />
-  </item>
-  <item name="org.gradle.api.plugins.Convention java.util.Map&lt;java.lang.String,java.lang.Object&gt; getPlugins()">
-    <annotation name="jet.runtime.typeinfo.KotlinSignature">
-      <val name="value" val="&quot;fun getPlugins() : MutableMap&lt;String, Any&gt;&quot;" />
-    </annotation>
-  </item>
-  <item name="org.gradle.api.plugins.Convention org.gradle.api.internal.DynamicObject getExtensionsAsDynamicObject()">
-    <annotation name="org.jetbrains.annotations.NotNull" />
-    <annotation name="jet.runtime.typeinfo.KotlinSignature">
-      <val name="value" val="&quot;fun getExtensionsAsDynamicObject() : DynamicObject&quot;" />
-    </annotation>
-  </item>
-  <item name="org.gradle.api.plugins.ExtensionAware org.gradle.api.plugins.ExtensionContainer getExtensions()">
-    <annotation name="org.jetbrains.annotations.NotNull" />
-  </item>
-  <item name="org.gradle.api.plugins.PluginContainer T apply(java.lang.Class&lt;T&gt;)">
-    <annotation name="org.jetbrains.annotations.NotNull" />
-  </item>
-  <item name="org.gradle.api.plugins.PluginContainer org.gradle.api.Plugin apply(java.lang.String)">
-    <annotation name="org.jetbrains.annotations.NotNull" />
-  </item>
+    <item name="org.gradle.api.plugins.Convention T getPlugin(java.lang.Class&lt;T&gt;)">
+      <annotation name="org.jetbrains.annotations.NotNull" />
+    </item>
+    <item name="org.gradle.api.plugins.Convention java.util.Map&lt;java.lang.String,java.lang.Object&gt; getPlugins()">
+      <annotation name="jet.runtime.typeinfo.KotlinSignature">
+        <val name="value" val="&quot;fun getPlugins() : MutableMap&lt;String, Any&gt;&quot;" />
+      </annotation>
+    </item>
+    <item name="org.gradle.api.plugins.Convention org.gradle.api.internal.DynamicObject getExtensionsAsDynamicObject()">
+      <annotation name="org.jetbrains.annotations.NotNull" />
+      <annotation name="jet.runtime.typeinfo.KotlinSignature">
+        <val name="value" val="&quot;fun getExtensionsAsDynamicObject() : DynamicObject&quot;" />
+      </annotation>
+    </item>
+    <item name="org.gradle.api.plugins.ExtensionAware org.gradle.api.plugins.ExtensionContainer getExtensions()">
+      <annotation name="org.jetbrains.annotations.NotNull" />
+    </item>
+    <item name="org.gradle.api.plugins.PluginContainer T apply(java.lang.Class&lt;T&gt;)">
+      <annotation name="org.jetbrains.annotations.NotNull" />
+    </item>
+    <item name="org.gradle.api.plugins.PluginContainer org.gradle.api.Plugin apply(java.lang.String)">
+      <annotation name="org.jetbrains.annotations.NotNull" />
+    </item>
+    <item name='org.gradle.api.plugins.PluginContainer org.gradle.api.Plugin findPlugin(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
+    </item>
 </root>
 
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 1c4e42ca784..6a6c7e82ea8 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -241,9 +241,9 @@ open class KotlinAndroidPlugin: Plugin<Project> {
                 }
 
                 kotlinTask.doFirst({ task  ->
-                    var plugin = project.getPlugins().getPlugin("android")
+                    var plugin = project.getPlugins().findPlugin("android")
                     if (null == plugin) {
-                        plugin = project.getPlugins().getPlugin("android-library")
+                        plugin = project.getPlugins().findPlugin("android-library")
                     }
                     val basePlugin : BasePlugin = plugin as BasePlugin
                     val javaSources = project.files(javaSourceList)