[MPP] [Android] KotlinAndroidTarget: filter AgpVersionAttr attribute
Ensure that the attribute com.android.build.api.attributes.AgpVersionAttr is not published when creating the android usage contexts. ^KT-49798 Verification Pending
This commit is contained in:
committed by
Space
parent
95018a9de0
commit
d5a081bf03
+7
-1
@@ -211,7 +211,9 @@ open class KotlinAndroidTarget(
|
|||||||
val value = configuration.attributes.getAttribute(it)
|
val value = configuration.attributes.getAttribute(it)
|
||||||
(value as? Named)?.name ?: value.toString()
|
(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
|
isSinglePublishedVariant -> false
|
||||||
else -> true
|
else -> true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun filterOutAndroidAgpVersionAttribute(
|
||||||
|
attribute: Attribute<*>
|
||||||
|
): Boolean = attribute.name != "com.android.build.api.attributes.AgpVersionAttr"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user