From 5dd52f7d409ae0d8fb764596d3b3d20870995f3b Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 15 Mar 2023 17:12:19 +0100 Subject: [PATCH] [tests] Apply modern plugins instead of legacy ones KotlinPlatform*Plugins are plugins from pre 1.3 MPP and shouldn't be used. The intention was to apply usual 'kotlin("jvm")' and 'kotlin("android")'-plugins, for which KotlinPluginWrapper and KotlinAndroidPlugin stand respectively --- .../org/jetbrains/kotlin/gradle/util/buildProject.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index 4ed2de8c564..3d0b6048ef9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt @@ -14,8 +14,8 @@ import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension -import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformAndroidPlugin -import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin +import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper +import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_COMPATIBILITY_METADATA_VARIANT import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_INTRANSITIVE_METADATA_CONFIGURATION @@ -51,11 +51,11 @@ fun buildProjectWithJvm(projectBuilder: ProjectBuilder.() -> Unit = {}, code: Pr } fun Project.applyKotlinJvmPlugin() { - project.plugins.apply(KotlinPlatformJvmPlugin::class.java) + project.plugins.apply(KotlinPluginWrapper::class.java) } fun Project.applyKotlinAndroidPlugin() { - project.plugins.apply(KotlinPlatformAndroidPlugin::class.java) + project.plugins.apply(KotlinAndroidPluginWrapper::class.java) } fun Project.kotlin(code: KotlinMultiplatformExtension.() -> Unit) {