azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle][Test] Fix KGP tests when min GradleVersion is higher than max supported

Browse Source
This commit is contained in:
Anton Lakotka
2022-06-22 01:15:56 +02:00
committed by Space
parent a74e451d19
commit 495c089add
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt
+4 -1
View File
@@ -29,8 +29,11 @@ open class GradleArgumentsProvider : ArgumentsProvider {
): Stream<out Arguments> { ): Stream<out Arguments> {
val versionsAnnotation = findAnnotation<GradleTestVersions>(context) val versionsAnnotation = findAnnotation<GradleTestVersions>(context)
fun max(a: GradleVersion, b: GradleVersion) = if (a >= b) a else b
val minGradleVersion = GradleVersion.version(versionsAnnotation.minVersion) 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 val additionalGradleVersions = versionsAnnotation
.additionalVersions .additionalVersions
.map(GradleVersion::version) .map(GradleVersion::version)