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

[Gradle] Fix warnings in KotlinAndroidSourceSetConfigurator

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-19 21:08:29 +01:00
committed by Space Team
parent be848cc432
commit cbfc2eb9c0
1 changed files with 24 additions and 9 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/configurator/KotlinAndroidSourceSetConfigurator.kt
+24 -9
View File
@@ -5,25 +5,28 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator
import com.android.build.gradle.api.AndroidSourceSet
import com.android.build.gradle.api.BaseVariant
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.*
internal interface KotlinAndroidSourceSetConfigurator { internal interface KotlinAndroidSourceSetConfigurator {
/** /**
* Called once, when the corresponding KotlinSourceSet is created for a given [AndroidSourceSet]. * Called once, when the corresponding KotlinSourceSet is created for a given [DeprecatedAndroidSourceSet].
* Note, this can also be called in 'afterEvaluate', when Android is finalizing its variants. * Note, this can also be called in 'afterEvaluate', when Android is finalizing its variants.
*/ */
fun configure( fun configure(
target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, androidSourceSet: AndroidSourceSet target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
) = Unit ) = Unit
/** /**
* Called every time, when a given [KotlinSourceSet] participates in a given Android variant. * Called every time, when a given [KotlinSourceSet] participates in a given Android variant.
*/ */
fun configureWithVariant( fun configureWithVariant(
target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, variant: BaseVariant target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant
) = Unit ) = Unit
} }
@@ -38,11 +41,19 @@ private class KotlinAndroidSourceSetConfigurationWithCondition(
private val underlying: KotlinAndroidSourceSetConfigurator, private val underlying: KotlinAndroidSourceSetConfigurator,
private val condition: (KotlinAndroidTarget) -> Boolean private val condition: (KotlinAndroidTarget) -> Boolean
) : KotlinAndroidSourceSetConfigurator { ) : KotlinAndroidSourceSetConfigurator {
override fun configure(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, androidSourceSet: AndroidSourceSet) { override fun configure(
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
) {
if (condition(target)) underlying.configure(target, kotlinSourceSet, androidSourceSet) if (condition(target)) underlying.configure(target, kotlinSourceSet, androidSourceSet)
} }
override fun configureWithVariant(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, variant: BaseVariant) { override fun configureWithVariant(
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant
) {
if (condition(target)) underlying.configureWithVariant(target, kotlinSourceSet, variant) if (condition(target)) underlying.configureWithVariant(target, kotlinSourceSet, variant)
} }
} }
@@ -62,14 +73,18 @@ private class CompositeKotlinAndroidSourceSetConfigurator(
override fun configure( override fun configure(
target: KotlinAndroidTarget, target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet, kotlinSourceSet: KotlinSourceSet,
androidSourceSet: AndroidSourceSet @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
) { ) {
configurators.forEach { configurator -> configurators.forEach { configurator ->
configurator.configure(target, kotlinSourceSet, androidSourceSet) configurator.configure(target, kotlinSourceSet, androidSourceSet)
} }
} }
override fun configureWithVariant(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, variant: BaseVariant) { override fun configureWithVariant(
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant
) {
configurators.forEach { configurator -> configurators.forEach { configurator ->
configurator.configureWithVariant(target, kotlinSourceSet, variant) configurator.configureWithVariant(target, kotlinSourceSet, variant)
} }