From 6a80cd596aa7e56b335e8238ac092427722dd202 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 28 Jun 2023 11:14:57 +0200
Subject: [PATCH] [Gradle] Fix kapt jvm target validation test on Gradle 8

^KT-59587 In Progress
---
 .../kotlin/gradle/JvmTargetValidationTest.kt         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt
index b14a6b0ab8f..aa2e018a4b5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt
@@ -345,17 +345,13 @@ class JvmTargetValidationTest : KGPBaseTest() {
         project(
             projectName = "kapt2/simple",
             gradleVersion = gradleVersion,
-            buildJdk = getJdk11().javaHome
         ) {
-            val toolchainJavaVersion = if (gradleVersion < GradleVersion.version("6.9")) {
-                15
-            } else {
-                16
-            }
+            val toolchainJavaVersion = if (gradleVersion < GradleVersion.version("6.9")) 11 else 16
 
             gradleProperties.append(
                 """
                 kotlin.jvm.target.validation.mode = error
+                org.gradle.java.installations.paths=${getJdk16().javaHome},${getJdk11().javaHome}
                 """.trimIndent()
             )
 
@@ -370,7 +366,7 @@ class JvmTargetValidationTest : KGPBaseTest() {
                 """.trimIndent()
             )
 
-            build("assemble", forceOutput = true)
+            build(":kaptGenerateStubsKotlin")
         }
     }
 
@@ -498,5 +494,7 @@ class JvmTargetValidationTest : KGPBaseTest() {
 
     private fun getJdk11(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk11Home")))
 
+    private fun getJdk16(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk16Home")))
+
     private val String.fullProjectName get() = "kotlin-java-toolchain/$this"
 }