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

[Gradle] Fix warnings in KotlinAndroidSourceSetFactory

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-15 10:37:19 +01:00
committed by Space Team
parent 30d6fa730e
commit db62637318
1 changed files with 7 additions and 5 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
+7 -5
View File
@@ -5,15 +5,13 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android 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.Logger
import org.gradle.api.logging.Logging import org.gradle.api.logging.Logging
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.getOrCreate import org.jetbrains.kotlin.gradle.utils.*
import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheck
internal class KotlinAndroidSourceSetFactory( internal class KotlinAndroidSourceSetFactory(
private val target: KotlinAndroidTarget, private val target: KotlinAndroidTarget,
@@ -23,7 +21,10 @@ internal class KotlinAndroidSourceSetFactory(
) { ) {
private val configuredKotlinSourceSets = mutableSetOf<KotlinSourceSet>() private val configuredKotlinSourceSets = mutableSetOf<KotlinSourceSet>()
fun getOrCreateConfiguredKotlinSourceSet(kotlinSourceSetName: String, androidSourceSet: AndroidSourceSet): KotlinSourceSet { fun getOrCreateConfiguredKotlinSourceSet(
kotlinSourceSetName: String,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
): KotlinSourceSet {
val kotlinSourceSet = getOrCreateKotlinSourceSet(kotlinSourceSetName, androidSourceSet) val kotlinSourceSet = getOrCreateKotlinSourceSet(kotlinSourceSetName, androidSourceSet)
if (configuredKotlinSourceSets.add(kotlinSourceSet)) { if (configuredKotlinSourceSets.add(kotlinSourceSet)) {
layout.sourceSetConfigurator.configure(target, kotlinSourceSet, androidSourceSet) layout.sourceSetConfigurator.configure(target, kotlinSourceSet, androidSourceSet)
@@ -37,7 +38,8 @@ internal class KotlinAndroidSourceSetFactory(
private fun getOrCreateKotlinSourceSet( private fun getOrCreateKotlinSourceSet(
name: String, androidSourceSet: AndroidSourceSet name: String,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
): KotlinSourceSet { ): KotlinSourceSet {
return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet -> return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet ->
kotlinSourceSet.androidSourceSetInfoOrNull?.let { info -> kotlinSourceSet.androidSourceSetInfoOrNull?.let { info ->