From 47dee4b88c9d65840975331a4eb8acb5c6e0170c Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 15 Sep 2022 11:45:24 +0200 Subject: [PATCH] Fix MPP tests ^KT-27301 In Progress --- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 2 +- .../kotlin/gradle/VariantAwareDependenciesMppIT.kt | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 44fac2691bc..5ea9ede9e74 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1781,7 +1781,7 @@ class NewMultiplatformIT : BaseGradleIT() { "Hello.internalFun\$new_mpp_associate_compilations", "HelloTest.internalTestFun\$new_mpp_associate_compilations" ) - assertFileExists("build/classes/kotlin/jvm/integrationTest/META-INF/new-mpp-associate-compilations.kotlin_module") + assertFileExists("build/classes/kotlin/jvm/integrationTest/META-INF/new-mpp-associate-compilations_integrationTest.kotlin_module") // JS: assertFileExists( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt index 4870358acbf..92002cc7f9b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt @@ -119,7 +119,13 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() { with(outerProject) { embedProject(innerProject) - gradleBuildScript(innerProject.projectName).appendText("\ndependencies { implementation rootProject }") + gradleBuildScript(innerProject.projectName).modify { + """ + ${it.replace("kotlinOptions.jvmTarget = \"1.7\"", "kotlinOptions.jvmTarget = \"11\"")} + + dependencies { implementation rootProject } + """.trimIndent() + } testResolveAllConfigurations(innerProject.projectName) }