From d5be59a8ec3036eebded57277b596340173ce0e7 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 18 Oct 2023 13:58:59 +0200 Subject: [PATCH] [Gradle] Implement ApplyJavaBasePluginSetupAction KT-61634 --- .../plugin/mpp/ApplyJavaBasePluginSetupAction.kt | 13 +++++++++++++ .../gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 6 +----- .../gradle/plugin/registerKotlinPluginExtensions.kt | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/ApplyJavaBasePluginSetupAction.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/ApplyJavaBasePluginSetupAction.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/ApplyJavaBasePluginSetupAction.kt new file mode 100644 index 00000000000..aa39d8464f2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/ApplyJavaBasePluginSetupAction.kt @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.plugin.mpp + +import org.gradle.api.plugins.JavaBasePlugin +import org.jetbrains.kotlin.gradle.plugin.KotlinProjectSetupAction + +internal val ApplyJavaBasePluginSetupAction = KotlinProjectSetupAction { + project.plugins.apply(JavaBasePlugin::class.java) +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 03dba78c74f..2b694ed1553 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -7,13 +7,9 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.plugins.JavaBasePlugin class KotlinMultiplatformPlugin : Plugin { - - override fun apply(project: Project) { - project.plugins.apply(JavaBasePlugin::class.java) - } + override fun apply(project: Project) = Unit companion object { const val METADATA_TARGET_NAME = "metadata" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt index d246bb474a7..ad885a3d13c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt @@ -69,6 +69,7 @@ internal fun Project.registerKotlinPluginExtensions() { } if (isMultiplatform) { + register(project, ApplyJavaBasePluginSetupAction) register(project, DeprecatedMppGradlePropertiesMigrationSetupAction) register(project, KotlinMultiplatformTargetPresetAction) register(project, KotlinMultiplatformSourceSetSetupAction)