diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle index b1f21f34636..575b243faac 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle @@ -1,22 +1,16 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } +plugins { + id("org.jetbrains.kotlin.multiplatform") } -apply plugin: 'kotlin-multiplatform' - repositories { mavenLocal() mavenCentral() } -kotlin.targets.fromPreset(kotlin.presets.js, 'nodeJs') { - nodejs() +kotlin { + js("nodeJs") { + nodejs() + } } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle index c5a17ced64a..8a05fdf6e1c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle @@ -1,22 +1,16 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } +plugins { + id("org.jetbrains.kotlin.multiplatform") } -apply plugin: "kotlin-multiplatform" - repositories { mavenLocal() mavenCentral() } -kotlin.targets.fromPreset(kotlin.presets.js, 'browser') { - browser() +kotlin { + js("browser") { + browser() + } } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt index 1fc7edba40a..31f06f6e6d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt @@ -44,17 +44,6 @@ abstract class KotlinMultiplatformExtension(project: Project) : targets ) - init { - val presetExtensionWithDeprecation = project.objects.newInstance( - TargetsFromPresetExtensionWithDeprecation::class.java, - project.logger, - project.path, - presetExtension - ) - @Suppress("DEPRECATION") - DslObject(targets).addConvention("fromPreset", presetExtensionWithDeprecation) - } - fun targets(configure: Action) { configure.execute(presetExtension) } @@ -147,45 +136,6 @@ internal abstract class DefaultTargetsFromPresetExtension @Inject constructor( } } -internal abstract class TargetsFromPresetExtensionWithDeprecation @Inject constructor( - private val logger: Logger, - private val projectPath: String, - private val parentExtension: DefaultTargetsFromPresetExtension -) : TargetsFromPresetExtension, - NamedDomainObjectCollection by parentExtension.targets { - - override fun fromPreset( - preset: KotlinTargetPreset, - name: String, - configureAction: T.() -> Unit - ): T { - printDeprecationMessage(preset, name) - return parentExtension.fromPreset(preset, name, configureAction) - } - - override fun fromPreset( - preset: KotlinTargetPreset, - name: String, - configureAction: Action - ): T { - printDeprecationMessage(preset, name) - return parentExtension.fromPreset(preset, name, configureAction) - } - - private fun printDeprecationMessage( - preset: KotlinTargetPreset, - targetName: String - ) { - logger.warn( - """ - Creating Kotlin target ${preset.name}:${targetName} via convention 'target.fromPreset()' in $projectPath project is deprecated!" - - Check https://kotlinlang.org/docs/multiplatform-set-up-targets.html documentation how to create MPP target. - """.trimIndent() - ) - } -} - internal fun KotlinTarget.isProducedFromPreset(kotlinTargetPreset: KotlinTargetPreset<*>): Boolean = preset == kotlinTargetPreset