Fix BasePluginConvention deprecation in KGP

This commit is contained in:
Sergey Igushkin
2021-11-15 22:35:27 +04:00
committed by Space
parent 2c6c2c3929
commit bc8f795f71
6 changed files with 13 additions and 17 deletions
@@ -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")
@@ -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
@@ -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")
@@ -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<T : Kotlin
override val moduleName: String
get() { // FIXME deduplicate with ownModuleName
val baseName = project.convention.findPlugin(BasePluginConvention::class.java)?.archivesBaseName
val baseName = project.extensions.getByType(BasePluginExtension::class.java).archivesName.orNull
?: project.name
val suffix = if (module.moduleClassifier == null) "" else "_${module.moduleClassifier}"
return filterModuleName("$baseName$suffix")
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.gradle.targets.js.subtargets
import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginConvention
import org.gradle.api.plugins.BasePluginExtension
import org.jetbrains.kotlin.gradle.targets.js.dsl.Distribution
import org.jetbrains.kotlin.gradle.utils.property
import java.io.File
@@ -16,13 +16,11 @@ class DefaultDistribution(
override var name: String? = null
) : Distribution {
private val basePluginConvention: BasePluginConvention
get() = project.convention.plugins["base"] as BasePluginConvention
override var directory: File by property {
project.buildDir
.let { buildDir ->
name?.let { buildDir.resolve(it) } ?: buildDir.resolve(basePluginConvention.distsDirName)
name?.let { buildDir.resolve(it) }
?: project.extensions.getByType(BasePluginExtension::class.java).distsDirectory.asFile.get()
}
}
}
@@ -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