From 2ab2f408f39ea8b03c4cca3e62469dd8a1050066 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 3 Aug 2023 12:24:55 +0200 Subject: [PATCH] [Gradle] PomDependenciesRewriter: Fix missing 'component' in configuration cache ^KT-60159 Verification Pending --- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 2 +- .../gradle/plugin/mpp/mppDependencyRewritingUtils.kt | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 486436fa267..ff02d03b795 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1257,7 +1257,7 @@ open class NewMultiplatformIT : BaseGradleIT() { """.trimIndent() ) - build("clean", "publish") { + build("clean", "publish", options = defaultBuildOptions().copy(configurationCache = true)) { assertSuccessful() assertFileContains( "repo/com/exampleapp/sample-app-nodejs/1.0/sample-app-nodejs-1.0.pom", diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt index 66f0bf98f28..0720fd51f97 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt @@ -17,7 +17,6 @@ import org.gradle.api.internal.component.UsageContext import org.gradle.api.provider.Provider import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsageContext.MavenScope @@ -31,9 +30,7 @@ internal data class ModuleCoordinates( internal class PomDependenciesRewriter( project: Project, - - @field:Transient - private val component: KotlinTargetComponent + component: KotlinTargetComponent ) { // Get the dependencies mapping according to the component's UsageContexts: @@ -52,9 +49,6 @@ internal class PomDependenciesRewriter( pomXml: XmlProvider, includeOnlySpecifiedDependencies: Provider>? = null ) { - if (component !is SoftwareComponentInternal) - return - val dependenciesNode = (pomXml.asNode().get("dependencies") as NodeList).filterIsInstance().singleOrNull() ?: return val dependencyNodes = (dependenciesNode.get("dependency") as? NodeList).orEmpty().filterIsInstance()