diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt index 412660ad031..6957ac1af87 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt @@ -211,7 +211,9 @@ open class KotlinAndroidTarget( val value = configuration.attributes.getAttribute(it) (value as? Named)?.name ?: value.toString() } - filterOutAndroidVariantAttribute(it) && filterOutAndroidBuildTypeAttribute(it, valueString, isSingleBuildType) + filterOutAndroidVariantAttribute(it) && + filterOutAndroidBuildTypeAttribute(it, valueString, isSingleBuildType) && + filterOutAndroidAgpVersionAttribute(it) } ) } @@ -238,4 +240,8 @@ open class KotlinAndroidTarget( isSinglePublishedVariant -> false else -> true } + + private fun filterOutAndroidAgpVersionAttribute( + attribute: Attribute<*> + ): Boolean = attribute.name != "com.android.build.api.attributes.AgpVersionAttr" }