From c290a44f2ba526d0bad26ebab023a4eed2c291b2 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 11 Sep 2023 11:16:41 +0200 Subject: [PATCH] [Gradle] Update UnnamedTaskInputsIT to use correct MPP project And fix incorrect code in hierarchical-mpp-multi-modules ^KT-61106 Verification Pending --- .../org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt | 2 +- .../kotlin/forJsJvmOnly/SomethinJsJvmaSpecial.kt | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt index 57d4bd1e971..3a06e463c61 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt @@ -52,7 +52,7 @@ class UnnamedTaskInputsIT : KGPBaseTest() { @DisplayName("MPP") @GradleTest fun inputsMpp(gradleVersion: GradleVersion) { - project("multiplatformProject", gradleVersion) { + project("hierarchical-mpp-multi-modules", gradleVersion) { enableLocalBuildCache(localBuildCacheDir) build("assemble") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/top-mpp/src/jsJvm18iOSMain/kotlin/forJsJvmOnly/SomethinJsJvmaSpecial.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/top-mpp/src/jsJvm18iOSMain/kotlin/forJsJvmOnly/SomethinJsJvmaSpecial.kt index f08a0ad14f9..8d66bb1fcef 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/top-mpp/src/jsJvm18iOSMain/kotlin/forJsJvmOnly/SomethinJsJvmaSpecial.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/top-mpp/src/jsJvm18iOSMain/kotlin/forJsJvmOnly/SomethinJsJvmaSpecial.kt @@ -1,10 +1,3 @@ package forJsJvmOnly -actual class SomethinJsJvmaSpecial { -} - -expect class SomethinJsJvmaSpecial { -} - -expect class HavingActualNearby -actual class HavingActualNearby \ No newline at end of file +class SomethinJsJvmaSpecial \ No newline at end of file