From 81b637876e9b8e97819e2d063b39d320fe2a4ba4 Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Mon, 3 Apr 2023 11:30:44 +0200 Subject: [PATCH] Revert "[Gradle][Tests][MPP] Use JDK_17 for XCFrameworkIT and AppleFrameworkIT" This reverts commit 91f38e76b8af380d05fd540e4b1acee51eb7ef83. --- .../org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt | 3 +-- .../kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index efd4bf39ba5..5361b945baf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -28,8 +28,7 @@ class AppleFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v7_4_0, - javaHome = KtTestUtil.getJdk17Home() + androidGradlePluginVersion = AGPVersion.v7_4_0 ) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index 0f4ec13c8a7..523d1347057 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -28,8 +28,7 @@ class XCFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v7_4_0, - javaHome = KtTestUtil.getJdk17Home() + androidGradlePluginVersion = AGPVersion.v7_4_0 ) @Test