From b13db88e6f85fd670301923147cc5b7e81008f11 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 12 Aug 2016 03:45:58 +0300
Subject: [PATCH] Kapt: Make javaCompile parameter in KotlinGradleSubplugin
 non-null (cherry picked from commit 9686344)

---
 .../src/main/kotlin/example/ExampleSubplugin.kt             | 2 +-
 .../jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt | 2 +-
 .../jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt    | 2 +-
 .../kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt    | 4 ++--
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt      | 6 ++----
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleSubplugin.kt b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleSubplugin.kt
index 035722b3f9e..5e56e511ac6 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleSubplugin.kt
+++ b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleSubplugin.kt
@@ -31,7 +31,7 @@ class ExampleSubplugin : KotlinGradleSubplugin {
     override fun apply(
             project: Project, 
             kotlinCompile: AbstractCompile, 
-            javaCompile: AbstractCompile?, 
+            javaCompile: AbstractCompile, 
             variantData: Any?,
             javaSourceSet: SourceSet?
     ): List<SubpluginOption> {
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt
index b6e411cd748..7a91a259d33 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt
@@ -28,7 +28,7 @@ interface KotlinGradleSubplugin {
     fun apply(
             project: Project, 
             kotlinCompile: AbstractCompile, 
-            javaCompile: AbstractCompile?,
+            javaCompile: AbstractCompile,
             variantData: Any?,
             javaSourceSet: SourceSet?
     ): List<SubpluginOption>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
index 1d723161e12..0ffc32b1213 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
@@ -62,7 +62,7 @@ class AndroidSubplugin : KotlinGradleSubplugin {
     override fun apply(
             project: Project,
             kotlinCompile: AbstractCompile, 
-            javaCompile: AbstractCompile?, 
+            javaCompile: AbstractCompile, 
             variantData: Any?, 
             javaSourceSet: SourceSet?
     ): List<SubpluginOption> {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt
index c1d5ac1f95e..f7a7768201d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt
@@ -61,8 +61,8 @@ class Kapt2KotlinGradleSubplugin : KotlinGradleSubplugin {
 
     override fun apply(
             project: Project, 
-            kotlinCompile: AbstractCompile, 
-            javaCompile: AbstractCompile?, 
+            kotlinCompile: AbstractCompile,
+            javaCompile: AbstractCompile,
             variantData: Any?,
             javaSourceSet: SourceSet?
     ): List<SubpluginOption> {
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 a10e86deba3..9a5c798cfad 100755
--- 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
@@ -131,10 +131,8 @@ class Kotlin2JvmSourceSetProcessor(
 
                 val subpluginEnvironment = loadSubplugins(project)
                 subpluginEnvironment.addSubpluginArguments(project, kotlinTask, 
-                        javaTask as? AbstractCompile, null, sourceSet)
+                        javaTask as JavaCompile, null, sourceSet)
                 
-                if (javaTask !is JavaCompile) return@afterEvaluate
-
                 var kotlinAfterJavaTask: KotlinCompile? = null
 
                 if (aptConfiguration.dependencies.size > 1 && !Kapt2GradleSubplugin.isEnabled(project)) {
@@ -490,7 +488,7 @@ class SubpluginEnvironment(
     fun addSubpluginArguments(
             project: Project, 
             kotlinTask: KotlinCompile, 
-            javaTask: AbstractCompile?,
+            javaTask: AbstractCompile,
             variantData: Any?,
             javaSourceSet: SourceSet?) {
         val pluginOptions = kotlinTask.pluginOptions