diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index 5b91118c42f..2db9f61c741 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -11,7 +11,6 @@ import org.gradle.api.UnknownTaskException import org.gradle.api.artifacts.Dependency import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.AbstractArchiveTask @@ -160,7 +159,7 @@ open class DefaultCompilationDetails( override val ownModuleName: String get() { - val baseName = project.extensions.getByType(BasePluginExtension::class.java)?.archivesName + val baseName = project.archivesName ?: project.name val suffix = if (isMainCompilationData()) "" else "_$compilationPurpose" return filterModuleName("$baseName$suffix") 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 e32184010ba..713d7f3353a 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 @@ -5,12 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 -import groovy.lang.Closure import org.gradle.api.artifacts.Configuration -import org.gradle.api.plugins.BasePluginConvention -import org.gradle.api.Project -import org.gradle.api.file.FileCollection -import org.gradle.api.plugins.BasePluginExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptionsImpl import org.jetbrains.kotlin.gradle.plugin.* @@ -50,7 +45,7 @@ class KotlinJvmVariantCompilationData(val variant: KotlinJvmVariant) : KotlinVar internal fun KotlinGradleVariant.ownModuleName(): String { val project = containingModule.project - val baseName = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull + val baseName = project.archivesName ?: 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 a347bf23176..57b8652b3a6 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,6 @@ 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.BasePluginExtension import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptionsImpl @@ -83,7 +82,7 @@ internal abstract class AbstractKotlinFragmentMetadataCompilationData name?.let { buildDir.resolve(it) } - ?: project.extensions.getByType(BasePluginExtension::class.java).distsDirectory.asFile.get() + ?: project.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 b8d0d81e338..c393e835bae 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,6 @@ 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.BasePluginExtension import org.gradle.api.provider.Provider import org.gradle.api.tasks.* import org.gradle.deployment.internal.Deployment @@ -21,6 +20,8 @@ import org.gradle.process.internal.ExecHandle import org.gradle.process.internal.ExecHandleFactory import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.distsDirectory import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies @@ -108,7 +109,7 @@ constructor( @Nested val output: KotlinWebpackOutput = KotlinWebpackOutput( - library = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull, + library = project.archivesName, libraryTarget = KotlinWebpackOutput.Target.UMD, globalObject = "this" ) @@ -122,7 +123,7 @@ constructor( internal var _destinationDirectory: File? = null private val defaultDestinationDirectory by lazy { - project.extensions.getByType(BasePluginExtension::class.java).distsDirectory.asFile.get() + project.distsDirectory.asFile.get() } @get:Internal @@ -133,7 +134,7 @@ constructor( } private val defaultOutputFileName by lazy { - project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull + ".js" + project.archivesName + ".js" } @get:Internal