From 16bf37b3f5f584b1ce6705c36399996f13a22ed1 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 13 Jan 2023 00:34:05 +0100 Subject: [PATCH] [Gradle, MPP] Add Gradle version requirements for AGP tests with version limits Each AGP version has its own compatible Gradle versions range. This commit adds additional version requirements for tests to respect AGP limitations #KT-52998 In Progress --- .../org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt | 4 ++++ .../gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt | 1 + 2 files changed, 5 insertions(+) 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 df53021029a..0f0b0eb56e8 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 @@ -505,6 +505,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { // AGP max version is limited due to https://youtrack.jetbrains.com/issue/KT-51940/HMPP-resolves-configurations-during-configuration @DisplayName("android app can depend on mpp lib") @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_72) + @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_4) // due AGP version limit ^ @GradleAndroidTest fun testAndroidWithNewMppApp( gradleVersion: GradleVersion, @@ -777,6 +778,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-49798: com.android.build.api.attributes.AgpVersionAttr is not published") @GradleAndroidTest @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ fun testKT49798AgpVersionAttrNotPublished( gradleVersion: GradleVersion, agpVersion: String, @@ -810,6 +812,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("produced artifacts are consumable by projects with various AGP versions") @GradleAndroidTest @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ fun testAndroidMultiplatformPublicationAGPCompatibility( gradleVersion: GradleVersion, agpVersion: String, @@ -862,6 +865,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-49877, KT-35916: associate compilation dependencies are passed correctly to android test compilations") @GradleAndroidTest @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ fun testAssociateCompilationDependenciesArePassedToAndroidTestCompilations( gradleVersion: GradleVersion, agpVersion: String, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt index c39fbad9627..f401e874b4c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt @@ -19,6 +19,7 @@ class MultiplatformAndroidSourceSetLayoutV2IT : KGPBaseTest() { @GradleAndroidTest @DisplayName("test Android project with flavors") @AndroidTestVersions(minVersion = "7.0.4") + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) // due AGP version limit ^ fun testProjectWithFlavors(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { project( "multiplatformAndroidSourceSetLayout2",