diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt index fc1970c507e..6aab6dca152 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt @@ -18,17 +18,14 @@ import org.jetbrains.kotlin.gradle.model.builder.KotlinModelBuilder import org.jetbrains.kotlin.gradle.plugin.KotlinJvmPlugin.Companion.configureCompilerOptionsForTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider -import org.jetbrains.kotlin.gradle.utils.whenEvaluated import org.jetbrains.kotlin.gradle.utils.androidPluginIds -import org.jetbrains.kotlin.gradle.utils.checkGradleCompatibility +import org.jetbrains.kotlin.gradle.utils.whenEvaluated internal open class KotlinAndroidPlugin( private val registry: ToolingModelBuilderRegistry ) : Plugin { override fun apply(project: Project) { - checkGradleCompatibility() - project.dynamicallyApplyWhenAndroidPluginIsApplied( { project.objects.newInstance( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index 80616d815c2..48d54cff418 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -62,8 +62,6 @@ abstract class DefaultKotlinBasePlugin : KotlinBasePlugin { override val pluginVersion: String = getKotlinPluginVersion(logger) override fun apply(project: Project) { - checkGradleCompatibility() - project.registerDefaultVariantImplementations() KotlinBuildStatsService.getOrCreateInstance(project)?.apply { report(StringMetrics.KOTLIN_COMPILER_VERSION, pluginVersion) @@ -220,8 +218,8 @@ abstract class KotlinBasePluginWrapper : DefaultKotlinBasePlugin() { override fun apply(project: Project) { super.apply(project) - project.logger.info("Using Kotlin Gradle Plugin $pluginVariant variant") + checkGradleCompatibility() project.configurations.maybeCreate(NATIVE_COMPILER_PLUGIN_CLASSPATH_CONFIGURATION_NAME).apply { isVisible = false 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 f3ba16c0d00..03dba78c74f 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 @@ -8,22 +8,10 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.JavaBasePlugin -import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.plugin.mpp.internal.runDeprecationDiagnostics -import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType -import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset -import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinWasmTargetPreset -import org.jetbrains.kotlin.gradle.utils.checkGradleCompatibility -import org.jetbrains.kotlin.konan.target.HostManager -import org.jetbrains.kotlin.konan.target.KonanTarget.* -import org.jetbrains.kotlin.konan.target.presetName class KotlinMultiplatformPlugin : Plugin { override fun apply(project: Project) { - checkGradleCompatibility("the Kotlin Multiplatform plugin") - runDeprecationDiagnostics(project) - project.plugins.apply(JavaBasePlugin::class.java) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt index 729fe169216..283c099fe7e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt @@ -25,8 +25,6 @@ open class KotlinJsPlugin: Plugin { // so investigation is needed project.plugins.apply(JavaBasePlugin::class.java) - checkGradleCompatibility() - project.enableKgpDependencyResolution(isEnabled = false) val kotlinExtension = project.kotlinExtension as KotlinJsProjectExtension