azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[kpm] Introduce GradleKpm* naming convention (1/2)

Browse Source 
All Gradle specific kpm entities shall be disambiguated by using
the `GradleKpm` prefix. For example `MyEntity` shall now be called
`GradleKpmMyEntity` and a subclass would be called like
`GradleKpmSpecialMyEntity`
This commit is contained in:
sebastian.sellmair
2022-05-24 14:30:16 +02:00
committed by Space
parent e55f00c3d9
commit dcd47a89dd
144 changed files with 1651 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
+1 -1
View File
@@ -45,7 +45,7 @@ val generateKpmNativeVariants by generator(
listOf(generateMppTargetContainerWithPresets, generateAbstractBinaryContainer, generateKpmNativeVariants).forEach {
it.systemProperty(
"org.jetbrains.kotlin.generators.gradle.dsl.outputSourceRoot",
project(":kotlin-gradle-plugin").projectDir.resolve("src/main/kotlin").absolutePath
project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath
)
}
libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/kpmNativeVariantCodegen.kt
+8 -8
View File
@@ -41,7 +41,7 @@ fun kpmNativeVariantsSourceCode() = """
${kpmVariantClassFunction().indented(skipFirstLine = true)}
""".trimIndent()
private val fileName = "KpmNativeVariants.kt"
private val fileName = "nativeVariants.kt"
private val packageName = "org.jetbrains.kotlin.gradle.plugin.mpp.pm20"
@@ -53,13 +53,13 @@ private fun variantClasses() = allKonanTargets()
private fun variantClass(konanTarget: KonanTarget) = """
open class ${konanTarget.variantClassName} @Inject constructor(
containingModule: KotlinGradleModule,
containingModule: GradleKpmModule,
fragmentName: String,
dependencyConfigurations: KotlinFragmentDependencyConfigurations,
dependencyConfigurations: GradleKpmFragmentDependencyConfigurations,
compileDependencyConfiguration: Configuration,
apiElementsConfiguration: Configuration,
hostSpecificMetadataElementsConfiguration: Configuration?
) : KotlinNativeVariantInternal(
) : GradleKpmNativeVariantInternal(
containingModule = containingModule,
fragmentName = fragmentName,
konanTarget = KonanTarget.${konanTarget.className},
@@ -69,7 +69,7 @@ private fun variantClass(konanTarget: KonanTarget) = """
hostSpecificMetadataElementsConfiguration = hostSpecificMetadataElementsConfiguration
) {
companion object {
val constructor = KotlinNativeVariantConstructor(
val constructor = GradleKpmNativeVariantConstructor(
KonanTarget.${konanTarget.className}, ${konanTarget.variantClassName}::class.java, ::${konanTarget.variantClassName}
)
}
@@ -81,7 +81,7 @@ private fun kpmVariantClassFunction(): String {
.joinToString("\n") { "KonanTarget.${it.className} -> ${it.variantClassName}::class.java" }
return """
internal fun kpmVariantClass(konanTarget: KonanTarget): Class<out KotlinNativeVariantInternal>? = when (konanTarget) {
internal fun kpmNativeVariantClass(konanTarget: KonanTarget): Class<out GradleKpmNativeVariantInternal>? = when (konanTarget) {
${konanTargetToVariant.indented(nSpaces = 12, skipFirstLine = true)}
else -> null
}
@@ -98,6 +98,6 @@ private fun allVariantConstructors() = allKonanTargets()
private val KonanTarget.variantClassName
get() = presetName
.capitalizeUS()
.let { "Kotlin${it}Variant" }
.let { "GradleKpm${it}Variant" }
private val KonanTarget.className get() = javaClass.simpleName
private val KonanTarget.className get() = javaClass.simpleName