diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt index f40a51bd02a..1c4509cafd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle +import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator import org.jetbrains.kotlin.gradle.util.modify import org.jetbrains.kotlin.konan.target.HostManager import java.io.File @@ -343,11 +344,16 @@ class KlibBasedMppIT : BaseGradleIT() { checkNoItemContains: List ) = with(testCase) { setupWorkingDir() + + @Suppress("INVISIBLE_MEMBER") + val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA + val printingTaskName = "printItems${testBuildRunId++}" gradleBuildScript(subproject).appendText( """ ${'\n'} - tasks.create("$printingTaskName") { + tasks.register("$printingTaskName") { + dependsOn("$transformAllTaskName") doLast { println("###$printingTaskName" + $itemsExpression) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt index 0deb1b28a6d..85adaaed66b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.api.logging.configuration.WarningMode import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.extension.ExtensionContext @@ -658,10 +659,15 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() { } else { if (isBuildGradleKts) buildGradleKts else buildGradle } + + @Suppress("INVISIBLE_MEMBER") + val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA + buildFile.appendText( """ - tasks.create("$printingTaskName") { + tasks.register("$printingTaskName") { + if ("$transformAllTaskName" in tasks.names) dependsOn("$transformAllTaskName") doLast { println("###$printingTaskName " + $itemsExpression) }