diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt index a2c607e395d..5ac3d7d3b71 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt @@ -15,7 +15,7 @@ import org.gradle.api.attributes.AttributeContainer import org.gradle.api.execution.TaskExecutionListener import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.gradle.api.plugins.BasePluginConvention +import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.api.provider.Property import org.gradle.api.tasks.TaskProvider @@ -370,7 +370,7 @@ internal fun addSourcesToKotlinCompileTask( private fun KotlinCompilation<*>.ownModuleName(): String { val project = target.project - val baseName = project.convention.findPlugin(BasePluginConvention::class.java)?.archivesBaseName + val baseName = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull ?: project.name val suffix = if (isMain()) "" else "_$compilationName" return filterModuleName("$baseName$suffix") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationTaskConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationTaskConfigurator.kt index 7f046038721..817401e9b4b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationTaskConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationTaskConfigurator.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.Project import org.gradle.api.tasks.TaskProvider +import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.plugin.Kotlin2JvmSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.KotlinNativeTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.mpp.addCommonSourcesToKotlinCompileTask diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt index 6eb904ea1df..a959d0e9e9b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt @@ -44,7 +44,7 @@ class KotlinJvmVariantCompilationData(val variant: KotlinJvmVariant) : KotlinVar internal fun KotlinGradleVariant.ownModuleName(): String { val project = containingModule.project - val baseName = project.convention.findPlugin(BasePluginConvention::class.java)?.archivesBaseName + val baseName = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull ?: project.name val suffix = if (containingModule.moduleClassifier == null) "" else "_${containingModule.moduleClassifier}" return filterModuleName("$baseName$suffix") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt index cb106165945..625d4a07ce5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt @@ -9,7 +9,7 @@ import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.gradle.api.plugins.BasePluginConvention +import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions @@ -79,7 +79,7 @@ internal abstract class AbstractKotlinFragmentMetadataCompilationData - name?.let { buildDir.resolve(it) } ?: buildDir.resolve(basePluginConvention.distsDirName) + name?.let { buildDir.resolve(it) } + ?: project.extensions.getByType(BasePluginExtension::class.java).distsDirectory.asFile.get() } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index 6d898502841..b8d0d81e338 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -11,7 +11,7 @@ import org.gradle.api.file.FileCollection import org.gradle.api.file.RegularFileProperty import org.gradle.api.internal.file.FileResolver import org.gradle.api.model.ObjectFactory -import org.gradle.api.plugins.BasePluginConvention +import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.provider.Provider import org.gradle.api.tasks.* import org.gradle.deployment.internal.Deployment @@ -106,12 +106,9 @@ constructor( @Input var saveEvaluatedConfigFile: Boolean = true - @Transient - private val baseConventions: BasePluginConvention? = project.convention.plugins["base"] as BasePluginConvention? - @Nested val output: KotlinWebpackOutput = KotlinWebpackOutput( - library = baseConventions?.archivesBaseName, + library = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull, libraryTarget = KotlinWebpackOutput.Target.UMD, globalObject = "this" ) @@ -125,7 +122,7 @@ constructor( internal var _destinationDirectory: File? = null private val defaultDestinationDirectory by lazy { - project.buildDir.resolve(baseConventions!!.distsDirName) + project.extensions.getByType(BasePluginExtension::class.java).distsDirectory.asFile.get() } @get:Internal @@ -136,7 +133,7 @@ constructor( } private val defaultOutputFileName by lazy { - baseConventions?.archivesBaseName + ".js" + project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull + ".js" } @get:Internal