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

[Gradle] Fix warnings in KotlinAndroidSourceSetInfo

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-15 10:38:43 +01:00
committed by Space Team
parent db62637318
commit ca996d0833
1 changed files with 6 additions and 4 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/KotlinAndroidSourceSetInfo.kt
+6 -4
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android package org.jetbrains.kotlin.gradle.plugin.sources.android
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import com.android.build.gradle.api.AndroidSourceSet
import com.android.builder.model.SourceProvider import com.android.builder.model.SourceProvider
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.UnknownDomainObjectException import org.gradle.api.UnknownDomainObjectException
@@ -14,7 +13,7 @@ import org.gradle.api.plugins.ExtensionAware
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.kotlinExtensionOrNull import org.jetbrains.kotlin.gradle.dsl.kotlinExtensionOrNull
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.utils.findByType import org.jetbrains.kotlin.gradle.utils.*
@ExperimentalKotlinGradlePluginApi @ExperimentalKotlinGradlePluginApi
val KotlinSourceSet.androidSourceSetInfoOrNull: KotlinAndroidSourceSetInfo? val KotlinSourceSet.androidSourceSetInfoOrNull: KotlinAndroidSourceSetInfo?
@@ -27,15 +26,18 @@ var KotlinSourceSet.androidSourceSetInfo: KotlinAndroidSourceSetInfo
(this as ExtensionAware).extensions.add("androidSourceSetInfo", value) (this as ExtensionAware).extensions.add("androidSourceSetInfo", value)
} }
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
@ExperimentalKotlinGradlePluginApi @ExperimentalKotlinGradlePluginApi
fun Project.findAndroidSourceSet(kotlinSourceSet: KotlinSourceSet): AndroidSourceSet? { fun Project.findAndroidSourceSet(kotlinSourceSet: KotlinSourceSet): DeprecatedAndroidSourceSet? {
val androidSourceSetInfo = kotlinSourceSet.androidSourceSetInfoOrNull ?: return null val androidSourceSetInfo = kotlinSourceSet.androidSourceSetInfoOrNull ?: return null
val android = extensions.findByType<BaseExtension>() ?: return null val android = extensions.findByType<BaseExtension>() ?: return null
return android.sourceSets.getByName(androidSourceSetInfo.androidSourceSetName) return android.sourceSets.getByName(androidSourceSetInfo.androidSourceSetName)
} }
@ExperimentalKotlinGradlePluginApi @ExperimentalKotlinGradlePluginApi
fun Project.findKotlinSourceSet(androidSourceSet: AndroidSourceSet): KotlinSourceSet? { fun Project.findKotlinSourceSet(
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
): KotlinSourceSet? {
return findKotlinSourceSet(androidSourceSet.name) return findKotlinSourceSet(androidSourceSet.name)
} }