From d5a081bf03405b8d91afeb54dae66ca9399714a4 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Fri, 19 Nov 2021 14:02:31 +0100
Subject: [PATCH] [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
---
 .../kotlin/gradle/targets/android/KotlinAndroidTarget.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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"
 }