diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index df6a42e093c..06cb855d337 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -459,7 +459,6 @@ internal constructor( args.enableAssertions = debuggable args.target = konanTarget.name args.produce = outputKind.name.toLowerCaseAsciiOnly() - args.expectActualLinker = sharedCompilationData != null args.metadataKlib = sharedCompilationData != null args.nodefaultlibs = sharedCompilationData != null args.manifestFile = sharedCompilationData?.manifestFile?.absolutePath diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt index 41d07600a28..bf6d975bda3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.internal.tasks.allOutputFiles import org.jetbrains.kotlin.gradle.logging.GradleErrorMessageCollector -import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.create @@ -87,7 +86,7 @@ abstract class KotlinCompileCommon @Inject constructor( args.reportPerf = true } - args.expectActualLinker = expectActualLinker.get() + args.metadataKlib = produceMetadataKlib.get() args.destination = destinationDirectory.get().asFile.normalize().absolutePath @@ -128,7 +127,7 @@ abstract class KotlinCompileCommon @Inject constructor( internal val refinesMetadataPaths: ConfigurableFileCollection = objectFactory.fileCollection() @get:Internal - internal val expectActualLinker = objectFactory.property(Boolean::class.java) + internal val produceMetadataKlib = objectFactory.property(Boolean::class.java) override fun callCompilerAsync( args: K2MetadataCompilerArguments, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileCommonConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileCommonConfig.kt index 00cef18452c..4d2dca0126c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileCommonConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileCommonConfig.kt @@ -14,7 +14,7 @@ internal class KotlinCompileCommonConfig( ) : AbstractKotlinCompileConfig(compilationInfo) { init { configureTask { task -> - task.expectActualLinker.value( + task.produceMetadataKlib.value( providers.provider { (compilationInfo.origin as? KotlinCommonCompilation)?.isKlibCompilation == true }