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

[Gradle] Fix testMppAndroidLibFlavorsPublication for AGP 7.0.4

Browse Source 
^KT-58305 Verification Pending
This commit is contained in:
Anton Lakotka
2023-05-03 08:49:22 +02:00
committed by Space Team
parent af318fdfb0
commit 39fc1ba81d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt
+3 -3
View File
@@ -200,7 +200,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
} }
} }
@AndroidTestVersions(minVersion = AGP_71) @AndroidTestVersions(minVersion = AGP_70)
@GradleTestVersions(minVersion = G_7_2) @GradleTestVersions(minVersion = G_7_2)
@DisplayName("android mpp lib flavors publication can be configured") @DisplayName("android mpp lib flavors publication can be configured")
@GradleAndroidTest @GradleAndroidTest
@@ -334,7 +334,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
listOf("fooBar", "fooBaz").forEach { flavorName -> listOf("fooBar", "fooBaz").forEach { flavorName ->
val flavor = flavorName.lowercase() 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( arrayOf(
"foo" to flavorName, "foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName "com.android.build.api.attributes.ProductFlavor:foo" to flavorName
@@ -386,7 +386,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
listOf("fooBar", "fooBaz").forEach { flavorName -> listOf("fooBar", "fooBaz").forEach { flavorName ->
val flavor = flavorName.lowercase() 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( arrayOf(
"foo" to flavorName, "foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName "com.android.build.api.attributes.ProductFlavor:foo" to flavorName