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

[Gradle][KT-53342] KotlinAndroidSourceSets: Extract KotlinAndroidSourceSetFactory

Browse Source
This commit is contained in:
sebastian.sellmair
2022-08-03 16:11:13 +02:00
committed by Space
parent 6a13c2797b
commit 60c90d6065
2 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetFactory.kt
+60
View File
@@ -0,0 +1,60 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.plugin.sources.android
import com.android.build.gradle.api.AndroidSourceSet
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.getOrCreate
import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheck
internal class KotlinAndroidSourceSetFactory(
private val target: KotlinAndroidTarget,
private val kotlin: KotlinProjectExtension,
private val layout: KotlinAndroidSourceSetLayout
) {
private val configuredKotlinSourceSets = mutableSetOf<KotlinSourceSet>()
fun getOrCreateConfiguredKotlinSourceSet(kotlinSourceSetName: String, androidSourceSet: AndroidSourceSet): KotlinSourceSet {
val kotlinSourceSet = getOrCreateKotlinSourceSet(kotlinSourceSetName, androidSourceSet)
if (configuredKotlinSourceSets.add(kotlinSourceSet)) {
layout.sourceSetConfigurator.configure(target, kotlinSourceSet, androidSourceSet)
target.project.runProjectConfigurationHealthCheck {
val layout = this@KotlinAndroidSourceSetFactory.layout
layout.checker.checkCreatedSourceSet(target, layout, kotlinSourceSet, androidSourceSet)
}
}
return kotlinSourceSet
}
private fun getOrCreateKotlinSourceSet(
name: String, androidSourceSet: AndroidSourceSet
): KotlinSourceSet {
return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet ->
kotlinSourceSet.androidSourceSetInfoOrNull?.let { info ->
check(info.kotlinSourceSetName == name) { "Bad 'androidSourceSetInfo' on $name: Bad 'kotlinSourceSetName'" }
check(info.androidSourceSetName == androidSourceSet.name) { "Bad 'androidSourceSetInfo' on $name: Bad 'androidSourceSetName'" }
return@getOrCreate
}
kotlinSourceSet.androidSourceSetInfo = KotlinAndroidSourceSetInfo.Mutable(
kotlinSourceSetName = name,
androidSourceSetName = androidSourceSet.name,
androidVariantType = AndroidBaseSourceSetName.byName(androidSourceSet.name)?.variantType ?: AndroidVariantType.Unknown
)
logger.debug("Created KotlinSourceSet: ${kotlinSourceSet.name} for AndroidSourceSet: ${androidSourceSet.name}")
}
}
private companion object {
val logger: Logger = Logging.getLogger(KotlinAndroidSourceSetFactory::class.java)
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSets.kt
+14 -56
View File
@@ -5,15 +5,11 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android
import com.android.build.gradle.api.AndroidSourceSet
import org.gradle.api.logging.Logging
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.forEachVariant
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.androidExtension
import org.jetbrains.kotlin.gradle.utils.getOrCreate
import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheck
internal object KotlinAndroidSourceSets {
@@ -26,74 +22,36 @@ internal object KotlinAndroidSourceSets {
) {
logger.debug("Applying ${KotlinAndroidSourceSetLayout::class.java.simpleName}: ${layout.name}")
val project = target.project
val kotlin = project.kotlinExtension
val android = project.androidExtension
val naming = layout.naming
val configurator = layout.sourceSetConfigurator
val checker = layout.checker
val android = target.project.androidExtension
val factory = KotlinAndroidSourceSetFactory(target, target.project.kotlinExtension, layout)
project.runProjectConfigurationHealthCheck {
checker.checkBeforeLayoutApplied(target, layout)
target.project.runProjectConfigurationHealthCheck {
layout.checker.checkBeforeLayoutApplied(target, layout)
}
/* Ensures that each KotlinSourceSet only invokes the 'configurator' once */
val configuredKotlinSourceSets = mutableSetOf<KotlinSourceSet>()
/*
Hook eagerly into AndroidSourceSet creation
Some 'base' source sets shall be created eagerly, as soon as available, too also
make them available in the buildscript dsl immediately.
*/
android.sourceSets.all { androidSourceSet ->
val kotlinSourceSetName = naming.kotlinSourceSetName(target.disambiguationClassifier, androidSourceSet.name) ?: return@all
val kotlinSourceSet = kotlin.getOrCreateKotlinSourceSet(kotlinSourceSetName, androidSourceSet)
if (configuredKotlinSourceSets.add(kotlinSourceSet)) {
configurator.configure(target, kotlinSourceSet, androidSourceSet)
project.runProjectConfigurationHealthCheck {
checker.checkCreatedSourceSet(target, layout, kotlinSourceSet, androidSourceSet)
}
}
val kotlinSourceSetName = layout.naming.kotlinSourceSetName(target.disambiguationClassifier, androidSourceSet.name)
factory.getOrCreateConfiguredKotlinSourceSet(kotlinSourceSetName ?: return@all, androidSourceSet)
}
/* Hook into Android's variant creation: This is invoked in 'afterEvaluate' */
forEachVariant(project) { variant ->
forEachVariant(target.project) { variant ->
variant.sourceSets.forEach { sourceProvider ->
val androidSourceSet = android.sourceSets.findByName(sourceProvider.name) ?: return@forEach
val kotlinSourceSetName = naming.kotlinSourceSetName(target.disambiguationClassifier, sourceProvider.name)
?: naming.kotlinSourceSetName(target.disambiguationClassifier, sourceProvider.name, variant.type)
val kotlinSourceSet = kotlin.getOrCreateKotlinSourceSet(kotlinSourceSetName, androidSourceSet)
if (configuredKotlinSourceSets.add(kotlinSourceSet)) {
configurator.configure(target, kotlinSourceSet, androidSourceSet)
project.runProjectConfigurationHealthCheck {
checker.checkCreatedSourceSet(target, layout, kotlinSourceSet, androidSourceSet)
}
}
configurator.configureWithVariant(target, kotlinSourceSet, variant)
val kotlinSourceSetName = layout.naming.kotlinSourceSetName(target.disambiguationClassifier, sourceProvider.name)
?: layout.naming.kotlinSourceSetName(target.disambiguationClassifier, sourceProvider.name, variant.type)
val kotlinSourceSet = factory.getOrCreateConfiguredKotlinSourceSet(kotlinSourceSetName, androidSourceSet)
layout.sourceSetConfigurator.configureWithVariant(target, kotlinSourceSet, variant)
}
}
}
private fun KotlinProjectExtension.getOrCreateKotlinSourceSet(
name: String, androidSourceSet: AndroidSourceSet
): KotlinSourceSet {
return sourceSets.getOrCreate(name) { kotlinSourceSet ->
kotlinSourceSet.androidSourceSetInfoOrNull?.let { info ->
check(info.kotlinSourceSetName == name) { "Bad 'androidSourceSetInfo' on $name: Bad 'kotlinSourceSetName'" }
check(info.androidSourceSetName == androidSourceSet.name) { "Bad 'androidSourceSetInfo' on $name: Bad 'androidSourceSetName'" }
return@getOrCreate
}
kotlinSourceSet.androidSourceSetInfo = KotlinAndroidSourceSetInfo.Mutable(
kotlinSourceSetName = name,
androidSourceSetName = androidSourceSet.name,
androidVariantType = AndroidBaseSourceSetName.byName(androidSourceSet.name)?.variantType ?: AndroidVariantType.Unknown
)
logger.debug("Created KotlinSourceSet: ${kotlinSourceSet.name} for AndroidSourceSet: ${androidSourceSet.name}")
}
}
}