From 39fc1ba81d45ea3bafad2418f7b57266fd9a671f Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 3 May 2023 08:49:22 +0200 Subject: [PATCH] [Gradle] Fix testMppAndroidLibFlavorsPublication for AGP 7.0.4 ^KT-58305 Verification Pending --- .../jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt index f8c78f11953..2b80ead79c5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt @@ -200,7 +200,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { } } - @AndroidTestVersions(minVersion = AGP_71) + @AndroidTestVersions(minVersion = AGP_70) @GradleTestVersions(minVersion = G_7_2) @DisplayName("android mpp lib flavors publication can be configured") @GradleAndroidTest @@ -334,7 +334,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { listOf("fooBar", "fooBaz").forEach { flavorName -> val flavor = flavorName.lowercase() - val flavorAttributes = if (AGPVersion.fromString(agpVersion) >= AGPVersion.v7_0_0) { + val flavorAttributes = if (AGPVersion.fromString(agpVersion) > AGPVersion.v7_0_0) { arrayOf( "foo" to flavorName, "com.android.build.api.attributes.ProductFlavor:foo" to flavorName @@ -386,7 +386,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { listOf("fooBar", "fooBaz").forEach { flavorName -> val flavor = flavorName.lowercase() - val flavorAttributes = if (AGPVersion.fromString(agpVersion) >= AGPVersion.v7_0_0) { + val flavorAttributes = if (AGPVersion.fromString(agpVersion) > AGPVersion.v7_0_0) { arrayOf( "foo" to flavorName, "com.android.build.api.attributes.ProductFlavor:foo" to flavorName