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

[Gradle] Use transformDependenciesMetadata task name directly

Browse Source 
Using internal TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA doesn't
work well with K2 compiler

^KT-49933
This commit is contained in:
Anton Lakotka
2023-01-13 10:33:53 +01:00
committed by Space Team
parent be3e3332d5
commit 1777fc58e7
2 changed files with 2 additions and 9 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/KlibBasedMppIT.kt
+1 -4
View File
@@ -345,15 +345,12 @@ class KlibBasedMppIT : BaseGradleIT() {
) = with(testCase) { ) = with(testCase) {
setupWorkingDir() setupWorkingDir()
@Suppress("INVISIBLE_MEMBER")
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
val printingTaskName = "printItems${testBuildRunId++}" val printingTaskName = "printItems${testBuildRunId++}"
gradleBuildScript(subproject).appendText( gradleBuildScript(subproject).appendText(
""" """
${'\n'} ${'\n'}
tasks.register("$printingTaskName") { tasks.register("$printingTaskName") {
dependsOn("$transformAllTaskName") dependsOn("transformDependenciesMetadata")
doLast { doLast {
println("###$printingTaskName" + $itemsExpression) println("###$printingTaskName" + $itemsExpression)
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
+1 -5
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.configuration.WarningMode import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.*
import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.extension.ExtensionContext
@@ -660,14 +659,11 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
if (isBuildGradleKts) buildGradleKts else buildGradle if (isBuildGradleKts) buildGradleKts else buildGradle
} }
@Suppress("INVISIBLE_MEMBER")
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
buildFile.appendText( buildFile.appendText(
""" """
tasks.register("$printingTaskName") { tasks.register("$printingTaskName") {
if ("$transformAllTaskName" in tasks.names) dependsOn("$transformAllTaskName") if ("transformDependenciesMetadata" in tasks.names) dependsOn("transformDependenciesMetadata")
doLast { doLast {
println("###$printingTaskName " + $itemsExpression) println("###$printingTaskName " + $itemsExpression)
} }