From d1bddb6250751c5605b15c055f5c999e7cb28508 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Wed, 28 Jun 2017 18:02:37 +0300
Subject: [PATCH] Fix disabling IC not applied to kapgGenerateStubsKotlin tasks

Issue #KT-18647 Fixed

(cherry picked from commit ffb656a)
---
 .../kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt     | 11 +++++++++++
 .../gradle/internal/Kapt3KotlinGradleSubplugin.kt     |  1 +
 2 files changed, 12 insertions(+)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
index 3defcf266c7..079e0c89e1f 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.gradle
 
+import org.jetbrains.kotlin.gradle.tasks.USING_INCREMENTAL_COMPILATION_MESSAGE
 import org.jetbrains.kotlin.gradle.util.*
 import org.junit.Test
 import java.io.File
@@ -115,6 +116,16 @@ open class Kapt3IT : Kapt3BaseIT() {
         }
     }
 
+    @Test
+    fun testDisableIcForGenerateStubs() {
+        val project = Project("simple", GRADLE_VERSION, directoryPrefix = "kapt2")
+        project.build("build", options = defaultBuildOptions().copy(incremental = false)) {
+            assertSuccessful()
+            assertContains(":kaptGenerateStubsKotlin")
+            assertNotContains(USING_INCREMENTAL_COMPILATION_MESSAGE)
+        }
+    }
+
     @Test
     fun testArguments() {
         Project("arguments", GRADLE_VERSION, directoryPrefix = "kapt2").build("build") {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
index 9414e58fbc6..05367f7ad06 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
@@ -306,6 +306,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
         kaptTask.destinationDir = getKaptIncrementalDataDir()
         kaptTask.mapClasspath { kotlinCompile.classpath }
         kaptTask.generatedSourcesDir = sourcesOutputDir
+        mapKotlinTaskProperties(project, kaptTask)
 
         buildAndAddOptionsTo(kaptTask.pluginOptions, aptMode = "stubs")