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 f2cdbc582e8..676d77a52fb 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 @@ -706,8 +706,6 @@ class KotlinAndroidMppIT : KGPBaseTest() { } val checkedConsumerAGPVersions = AGPVersion.testedVersions - // Special version added for testing KT-49798 - .plus(AGPVersion.fromString("7.1.0-beta02")) .filter { version -> version >= AGPVersion.fromString(TestVersions.AGP.AGP_42) } .filter { version -> version < AGPVersion.fromString(TestVersions.AGP.MAX_SUPPORTED) } .map { it.toString() } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt index 8f643bad7e2..561460d0e8d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt @@ -39,6 +39,7 @@ interface TestVersions { const val AGP_71 = "7.1.3" const val AGP_72 = "7.2.1" const val AGP_73 = "7.3.0" + const val AGP_74 = "7.4.0-beta05" const val MIN_SUPPORTED = AGP_41 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION const val MAX_SUPPORTED = AGP_72 // Update once Gradle MAX_SUPPORTED version will be bumped to 7.2+ @@ -56,6 +57,7 @@ interface TestVersions { AGP_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), AGP_72(AGP.AGP_72, GradleVersion.version(Gradle.G_7_3), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), AGP_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_4), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11), + AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11), ; } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt index 38210843921..4736b4500fe 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt @@ -24,7 +24,8 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) { val v7_1_0 = fromString("7.1.2") val v7_2_2 = fromString("7.2.2") val v7_3_0 = fromString("7.3.0") + val v7_4_0 = fromString("7.4.0-beta05") - val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0) + val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0, v7_4_0) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt index e942422f7c6..0bf1d6a3643 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt @@ -18,7 +18,7 @@ internal object KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck { val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange( minSupportedVersion = AndroidGradlePluginVersionRange.Version(4, 1), - maxSupportedVersion = AndroidGradlePluginVersionRange.Version(7, 3) + maxSupportedVersion = AndroidGradlePluginVersionRange.Version(7, 4) ) /**