From 1abfeb96d4df66acf762a626f597a3a443933c12 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 16 Sep 2022 12:39:52 +0200 Subject: [PATCH] [Gradle][MPP] MPP/AGP compatibility: Bump maxSupportedVersion to 7.3 ^KT-54071 Verification Pending (cherry picked from commit 2ba7c7b8a99626a28c0058cd1af628b588cf06a8) --- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 2 ++ .../kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt | 4 +++- ...ultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 1c856991b8a3e..41a37ddfd31ee 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -757,6 +757,8 @@ open class KotlinAndroid71GradleIT : KotlinAndroid70GradleIT() { // Special version added for testing KT-49798 .plus(AGPVersion.fromString("7.1.0-beta02")) .filter { version -> version >= AGPVersion.v4_2_0 } + // Current Gradle version within kotlin.git is not sufficient to build with higher AGP + .filter { version -> version < AGPVersion.v7_2_2 } checkedConsumerAGPVersions.forEach { agpVersion -> 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 88511a6db03d4..e825a7bfd672e 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 @@ -23,7 +23,9 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) { val v4_2_0 = fromString("4.2.2") val v7_0_0 = fromString("7.0.4") 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 testedVersions = listOf(v3_6_0, v4_1_0, v4_2_0, v7_0_0, v7_1_0) + val testedVersions = listOf(v3_6_0, v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_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 1cf3f24360b27..315b47c792e7e 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 @@ -19,7 +19,7 @@ internal object KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck { val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange( minSupportedVersion = AndroidGradlePluginVersion(4, 0), - maxSupportedVersion = AndroidGradlePluginVersion(7, 2) + maxSupportedVersion = AndroidGradlePluginVersion(7, 3) ) /**