azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[Gradle][Tests][MPP] Use JDK_17 for XCFrameworkIT and AppleFrameworkIT"

Browse Source 
This reverts commit 91f38e76b8.
This commit is contained in:
Pavel Kargashinsky
2023-04-03 11:30:44 +02:00
parent 921cfa84df
commit 81b637876e
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt
+1 -2
View File
@@ -28,8 +28,7 @@ class AppleFrameworkIT : BaseGradleIT() {
override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT
override fun defaultBuildOptions() = super.defaultBuildOptions().copy( override fun defaultBuildOptions() = super.defaultBuildOptions().copy(
androidHome = KtTestUtil.findAndroidSdk(), androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = AGPVersion.v7_4_0, androidGradlePluginVersion = AGPVersion.v7_4_0
javaHome = KtTestUtil.getJdk17Home()
) )
@Test @Test
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt
+1 -2
View File
@@ -28,8 +28,7 @@ class XCFrameworkIT : BaseGradleIT() {
override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT
override fun defaultBuildOptions() = super.defaultBuildOptions().copy( override fun defaultBuildOptions() = super.defaultBuildOptions().copy(
androidHome = KtTestUtil.findAndroidSdk(), androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = AGPVersion.v7_4_0, androidGradlePluginVersion = AGPVersion.v7_4_0
javaHome = KtTestUtil.getJdk17Home()
) )
@Test @Test