[Gradle][Tests][MPP] Support JDK_17 for AndroidAndJavaConsumeMppLibIT with Gradle 8.0
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index 6fb6239..5b89e7b 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -22,6 +22,7 @@
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.test.RunnerWithMuteInDatabase
+import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.After
import org.junit.AfterClass
import org.junit.Assume
@@ -1019,6 +1020,14 @@
source.listFiles()?.forEach { copyRecursively(it, target) }
}
+ fun getJavaHomeByGradleVersion(gradleVersion: String): File {
+ return if (GradleVersion.version(gradleVersion) < GradleVersion.version(TestVersions.Gradle.G_8_0)) {
+ KtTestUtil.getJdk11Home()
+ } else {
+ KtTestUtil.getJdk17Home()
+ }
+ }
+
private fun String.normalizePath() = replace("\\", "/")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
index e4d3e09..9c7b055 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
@@ -126,16 +126,14 @@
@Before
override fun setUp() {
super.setUp()
-
- val jdk11Home = File(System.getProperty("jdk11Home"))
- Assume.assumeTrue("This test requires JDK11 for AGP7", jdk11Home.isDirectory)
+ val javaHome = getJavaHomeByGradleVersion(producerGradleVersion.minVersion)
val producerBuildOptions: BuildOptions
dependencyProject = Project("new-mpp-android", producerGradleVersion, minLogLevel = LogLevel.INFO).apply {
val usedProducerGradleVersion = chooseWrapperVersionOrFinishTest()
producerBuildOptions = defaultBuildOptions().copy(
- javaHome = jdk11Home,
+ javaHome = javaHome,
androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = producerAgpVersion,
).suppressDeprecationWarningsOn(
@@ -298,10 +296,7 @@
if (isPublishedLibrary)
"com.example:lib:1.0"
else ":${dependencyProject.projectName}:lib"
- val javaHome =
- if (GradleVersion.version(usedConsumerGradleVersion) < GradleVersion.version(TestVersions.Gradle.G_8_0))
- File(System.getProperty("jdk11Home"))
- else KtTestUtil.getJdk17Home()
+ val javaHome = getJavaHomeByGradleVersion(consumerGradleVersion.minVersion)
val consumerBuildOptions = defaultBuildOptions().copy(
javaHome = javaHome,
