From d33c9d7912c19d51622686b0bb69a14cacf14c2c Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Fri, 13 Jan 2023 14:00:46 +0100 Subject: [PATCH] [Gradle] resolveIdeDependencies should depend on transformation tasks ^KT-49933 --- .../kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt index 253e7ea3c64..99e55630fb3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt @@ -8,10 +8,13 @@ package org.jetbrains.kotlin.gradle.plugin.ide import com.google.gson.* import org.gradle.api.DefaultTask import org.gradle.api.Project +import org.gradle.api.Task import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependencyCoordinates +import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator +import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask import org.jetbrains.kotlin.gradle.utils.appendLine import org.jetbrains.kotlin.gradle.utils.notCompatibleWithConfigurationCacheCompat @@ -20,10 +23,12 @@ import java.io.File import java.lang.reflect.Type internal fun Project.locateOrRegisterIdeResolveDependenciesTask(): TaskProvider { - return locateOrRegisterTask("resolveIdeDependencies") { task -> + return locateOrRegisterTask("resolveIdeDependencies") { task -> task.description = "Debugging/Diagnosing task that will resolve dependencies for the IDE" task.group = "ide" task.notCompatibleWithConfigurationCacheCompat("Just a debugging util") + }.also { + it.dependsOn(locateOrRegisterTask(KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA)) } }