From 8acc6c9093ae3550d689e2a5414152fe14e33644 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 12 Sep 2022 10:04:28 +0200 Subject: [PATCH] [Gradle][MPP] Mark sourceSet field as transient in CInteropMetadataDependencyTransformationTask ^KT-52726 Verification Pending --- .../kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt | 2 +- .../internal/CInteropMetadataDependencyTransformationTask.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index 9d7c53cfb0b..ea57665f460 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -95,7 +95,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { build("build", buildOptions = buildOptions) { // Reduce the problem numbers when a Task become compatible with GCC. // When all tasks support GCC, replace these assertions with `testConfigurationCacheOf` - assertOutputContains("16 problems were found storing the configuration cache, 6 of which seem unique.") + assertOutputContains("4 problems were found storing the configuration cache, 2 of which seem unique.") configCacheIncompatibleTaskTypes.forEach { taskType -> assertOutputContains( """Task `\S+` of type `[\w.]+$taskType`: .+(at execution time is unsupported)|(not supported with the configuration cache)""" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt index 8d4b7df5ed4..e03008418cb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt @@ -98,7 +98,7 @@ private fun CInteropMetadataDependencyTransformationTask.onlyIfSourceSetIsShared } internal open class CInteropMetadataDependencyTransformationTask @Inject constructor( - @get:Internal val sourceSet: DefaultKotlinSourceSet, + @Transient @get:Internal val sourceSet: DefaultKotlinSourceSet, @get:OutputDirectory val outputDirectory: File ) : DefaultTask() {