From 63e7749cfe7b64e0bc2354c821760bb93bafd43b Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 10 Dec 2023 10:50:40 +0100 Subject: [PATCH] [Gradle] Update AGP versions --- .../kotlin/gradle/android/ExternalAndroidTargetIT.kt | 5 ++++- .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt index c7269733ffb..a6e1d0048f8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt @@ -19,7 +19,10 @@ import java.nio.file.Path import kotlin.io.path.readText import kotlin.test.fail -@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82) +// We are using the latest available AGP in this test suite as a max version +// to ensure AGP and MPP integration is not broken. +// This integration allows AGP to configure android target in MPP. +@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82, maxVersion = TestVersions.AGP.AGP_83) @AndroidGradlePluginTests class ExternalAndroidTargetIT : KGPBaseTest() { 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 43d616f5c81..4020c553fec 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 @@ -49,8 +49,8 @@ interface TestVersions { const val AGP_74 = "7.4.2" const val AGP_80 = "8.0.2" const val AGP_81 = "8.1.3" - const val AGP_82 = "8.2.0-rc03" - const val AGP_83 = "8.3.0-alpha12" + const val AGP_82 = "8.2.0" + const val AGP_83 = "8.3.0-alpha17" const val MIN_SUPPORTED = AGP_71 // KotlinAndroidPlugin.minimalSupportedAgpVersion const val MAX_SUPPORTED = AGP_82 // Update once Gradle MAX_SUPPORTED version will be bumped @@ -69,7 +69,7 @@ interface TestVersions { AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17), AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), - AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_3), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), + AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), ; }