From a7cb58418bcb7c531a2bff40c7660aed33b779ca Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 13 Jan 2023 19:19:04 +0100 Subject: [PATCH] Bump max AGP version in tests to 7.4.0 --- .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt | 8 ++++---- .../kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 927e04deb11..9c53bd590f5 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 @@ -42,12 +42,12 @@ interface TestVersions { const val AGP_70 = "7.0.4" const val AGP_71 = "7.1.3" const val AGP_72 = "7.2.2" - const val AGP_73 = "7.3.0" - const val AGP_74 = "7.4.0-rc03" + const val AGP_73 = "7.3.1" + const val AGP_74 = "7.4.0" const val AGP_80 = "8.0.0-alpha11" const val MIN_SUPPORTED = AGP_41 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION - const val MAX_SUPPORTED = AGP_73 // Update once Gradle MAX_SUPPORTED version will be bumped + const val MAX_SUPPORTED = AGP_74 // Update once Gradle MAX_SUPPORTED version will be bumped } enum class AgpCompatibilityMatrix( @@ -62,7 +62,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_8_0), JavaVersion.VERSION_11), + AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11), AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17), ; } 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 452d620356a..8eccba1d194 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,8 +23,8 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) { val v7_0_0 = fromString("7.0.4") val v7_1_0 = fromString("7.1.3") val v7_2_2 = fromString("7.2.2") - val v7_3_0 = fromString("7.3.0") - val v7_4_0 = fromString("7.4.0-rc03") + val v7_3_0 = fromString("7.3.1") + val v7_4_0 = fromString("7.4.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) }