From b2d13ac89b4ebb367a79e4b33c7b7c1b275cb7d6 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Tue, 15 May 2018 21:01:00 +0300
Subject: [PATCH] Fix Kapt incremental test with Gradle >= 4.3

---
 .../org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
index 2ce5b5dd3af..2141ff36f83 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
@@ -21,8 +21,15 @@ class Kapt3Incremental : KaptIncrementalBaseIT(shouldUseStubs = false, useKapt3
         project.projectFile("test.kt").modify { "\n$it" }
         project.build("build") {
             assertSuccessful()
-            assertTasksExecuted(":kaptGenerateStubsKotlin", ":compileJava", ":compileKotlin")
+            assertTasksExecuted(":kaptGenerateStubsKotlin", ":compileKotlin")
             assertTasksUpToDate(":kaptKotlin")
+
+            // compileJava is up-to-date with Gradle >= 4.3, executed otherwise
+            if (project.testGradleVersionAtLeast("4.3")) {
+                assertTasksUpToDate(":compileJava")
+            } else {
+                assertTasksExecuted(":compileJava")
+            }
         }
     }
 }