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

[Gradle] Fix warnings in KotlinAndroidTarget

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2023-12-20 22:27:11 +01:00
committed by Space Team
parent 0692346715
commit 5b6363b0df
1 changed files with 6 additions and 6 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/targets/android/KotlinAndroidTarget.kt
+6 -6
View File
@@ -6,7 +6,6 @@
@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import com.android.build.gradle.api.BaseVariant
import org.gradle.api.* import org.gradle.api.*
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.Configuration
import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.Attribute
@@ -145,14 +144,15 @@ abstract class KotlinAndroidTarget @Inject constructor(
KotlinAndroidPlugin.androidTargetHandler().doCreateComponents() KotlinAndroidPlugin.androidTargetHandler().doCreateComponents()
} }
private fun isVariantPublished(variant: BaseVariant): Boolean { private fun isVariantPublished(
return publishLibraryVariants?.contains(getVariantName(variant)) ?: true @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant
} ): Boolean = publishLibraryVariants?.contains(getVariantName(variant)) ?: true
private fun AndroidProjectHandler.doCreateComponents(): Set<KotlinTargetComponent> { private fun AndroidProjectHandler.doCreateComponents(): Set<KotlinTargetComponent> {
assert(project.state.executed) { "Android: doCreateComponents requires 'afterEvaluate' based project state" } assert(project.state.executed) { "Android: doCreateComponents requires 'afterEvaluate' based project state" }
val publishableVariants = mutableListOf<BaseVariant>() @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
val publishableVariants = mutableListOf<DeprecatedAndroidBaseVariant>()
.apply { project.forAllAndroidVariants { add(it) } } .apply { project.forAllAndroidVariants { add(it) } }
.toList() // Defensive copy against unlikely modification by the lambda that captures the list above in forEachVariant { } .toList() // Defensive copy against unlikely modification by the lambda that captures the list above in forEachVariant { }
.filter { getLibraryOutputTask(it) != null } .filter { getLibraryOutputTask(it) != null }
@@ -209,7 +209,7 @@ abstract class KotlinAndroidTarget @Inject constructor(
} }
private fun AndroidProjectHandler.createAndroidUsageContexts( private fun AndroidProjectHandler.createAndroidUsageContexts(
variant: BaseVariant, @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant,
compilation: KotlinCompilation<*>, compilation: KotlinCompilation<*>,
isSingleBuildType: Boolean, isSingleBuildType: Boolean,
): Set<DefaultKotlinUsageContext> { ): Set<DefaultKotlinUsageContext> {