diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index 3825c3f4eb8..ee8b73a0179 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -29,10 +29,10 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPI import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.KOTLIN_NATIVE_IGNORE_INCORRECT_DEPENDENCIES import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.apple.registerEmbedAndSignAppleFrameworkTask -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinGradleVariant -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinNativeCompilationData -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.isMainCompilationData +import org.jetbrains.kotlin.gradle.plugin.mpp.isMain +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KpmAwareTargetConfigurator +import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled import org.jetbrains.kotlin.gradle.targets.native.* import org.jetbrains.kotlin.gradle.targets.native.internal.commonizeCInteropTask @@ -545,6 +545,19 @@ open class KotlinNativeTargetConfigurator : AbstractKotl } } +internal class KpmNativeTargetConfigurator(private val nativeTargetConfigurator: KotlinNativeTargetConfigurator) : + KpmAwareTargetConfigurator(nativeTargetConfigurator) { + + override fun configureTarget(target: T) { + super.configureTarget(target) + configureBinariesTask(target) + } + + private fun configureBinariesTask(target: T) { + target.project.registerTask(target.artifactsTaskName) { } + } +} + abstract class KotlinNativeTargetWithTestsConfigurator< TargetType : KotlinNativeTargetWithTests, TestRunType : KotlinNativeBinaryTestRun, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt index 6198da948d2..238c9cb95ee 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt @@ -130,7 +130,7 @@ open class KotlinNativeTargetPreset(name: String, project: Project, konanTarget: override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator { val configurator = KotlinNativeTargetConfigurator() return if (isKpm) - KpmAwareTargetConfigurator(configurator) + KpmNativeTargetConfigurator(configurator) else configurator } @@ -145,7 +145,7 @@ open class KotlinNativeTargetWithHostTestsPreset(name: String, project: Project, override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator { val configurator = KotlinNativeTargetWithHostTestsConfigurator() return if (isKpm) - KpmAwareTargetWithTestsConfigurator(configurator) + KpmNativeTargetConfigurator(configurator) else configurator } @@ -159,7 +159,7 @@ open class KotlinNativeTargetWithSimulatorTestsPreset(name: String, project: Pro override fun createTargetConfigurator(): AbstractKotlinTargetConfigurator { val configurator = KotlinNativeTargetWithSimulatorTestsConfigurator() return if (isKpm) - KpmAwareTargetConfigurator(configurator) + KpmNativeTargetConfigurator(configurator) else configurator }