From 495c089add1e91d412c7f5182b500efe3b5f4298 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 22 Jun 2022 01:15:56 +0200 Subject: [PATCH] [Gradle][Test] Fix KGP tests when min GradleVersion is higher than max supported --- .../org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt index feda9261129..6acfa040772 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt @@ -29,8 +29,11 @@ open class GradleArgumentsProvider : ArgumentsProvider { ): Stream { val versionsAnnotation = findAnnotation(context) + fun max(a: GradleVersion, b: GradleVersion) = if (a >= b) a else b val minGradleVersion = GradleVersion.version(versionsAnnotation.minVersion) - val maxGradleVersion = GradleVersion.version(versionsAnnotation.maxVersion) + // Max is used for cases when test is annotated with `@GradleTestVersions(minVersion = LATEST)` but MAX_SUPPORTED isn't latest + val maxGradleVersion = max(GradleVersion.version(versionsAnnotation.maxVersion), minGradleVersion) + val additionalGradleVersions = versionsAnnotation .additionalVersions .map(GradleVersion::version)