From 1777fc58e750967e8e6de649e9c92ec5ca8aecd6 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Fri, 13 Jan 2023 10:33:53 +0100
Subject: [PATCH] [Gradle] Use `transformDependenciesMetadata` task name
 directly

Using internal TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA doesn't
work well with K2 compiler

^KT-49933
---
 .../kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt    | 5 +----
 .../jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

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 1c4509cafd3..e4759536269 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
@@ -345,15 +345,12 @@ class KlibBasedMppIT : BaseGradleIT() {
     ) = with(testCase) {
         setupWorkingDir()
 
-        @Suppress("INVISIBLE_MEMBER")
-        val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
-
         val printingTaskName = "printItems${testBuildRunId++}"
         gradleBuildScript(subproject).appendText(
             """
         ${'\n'}
         tasks.register("$printingTaskName") {
-            dependsOn("$transformAllTaskName")
+            dependsOn("transformDependenciesMetadata")
             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 85adaaed66b..98b9d7b7232 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,7 +7,6 @@ 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
@@ -660,14 +659,11 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
             if (isBuildGradleKts) buildGradleKts else buildGradle
         }
 
-        @Suppress("INVISIBLE_MEMBER")
-        val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
-
         buildFile.appendText(
             """
 
             tasks.register("$printingTaskName") {
-                if ("$transformAllTaskName" in tasks.names) dependsOn("$transformAllTaskName")
+                if ("transformDependenciesMetadata" in tasks.names) dependsOn("transformDependenciesMetadata")
                 doLast {
                     println("###$printingTaskName " + $itemsExpression)
                 }