From 9bd3619fb860530da8337086965077867abdb45a Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Mon, 8 Jul 2013 22:23:52 +0400
Subject: [PATCH] Allow using Kotlin without explicit 'java' plugin

---
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 e0ab2938193..fd3478ccc87 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
@@ -32,6 +32,7 @@ import com.android.build.gradle.api.ApkVariant
 import com.android.builder.model.BuildType
 import com.android.builder.BuilderConstants
 import com.android.build.gradle.api.TestVariant
+import org.gradle.api.plugins.JavaPlugin
 
 open class KotlinPlugin: Plugin<Project> {
 
@@ -39,7 +40,7 @@ open class KotlinPlugin: Plugin<Project> {
         val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>())
         val javaPluginConvention = project.getConvention().getPlugin(javaClass<JavaPluginConvention>())
 
-        //project.getPlugins().apply(javaClass<JavaPlugin>())
+        project.getPlugins().apply(javaClass<JavaPlugin>())
 
         configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
         configureKDoc(project, javaPluginConvention)