From 0a2e62ac839f15939e61de990e57307658f69832 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Thu, 30 Jul 2020 13:25:02 +0200 Subject: Implement `TestEnvironment` and `exhaustive` APIs for Gradle integration tests --- .../dokka/it/gradle/Android0GradleIntegrationTest.kt | 12 ++++++------ .../jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka') diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt index f9db9757..d6dfe451 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt @@ -14,16 +14,16 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst @get:JvmStatic @get:Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.5.1", "5.6.4"), - kotlinVersions = listOf("1.3.72", "1.4.0-rc"), - androidGradlePluginVersions = listOf("3.5.3", "3.6.3") + gradleVersions = listOf("6.5.1", *ifExhaustive("5.6.4")), + kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")), + androidGradlePluginVersions = listOf("3.5.3", *ifExhaustive("3.6.3")) ) + BuildVersions.permutations( - gradleVersions = listOf("6.5.1", "6.1.1"), - kotlinVersions = listOf("1.3.72", "1.4.0-rc"), + gradleVersions = listOf("6.5.1", *ifExhaustive("6.1.1")), + kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")), androidGradlePluginVersions = listOf("4.0.0") ) + BuildVersions.permutations( gradleVersions = listOf("6.5.1"), - kotlinVersions = listOf("1.3.72", "1.4.0-rc"), + kotlinVersions = listOf("1.4.0-rc", *ifExhaustive("1.3.72")), androidGradlePluginVersions = listOf("4.1.0-beta02") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt index 5afb77e7..54021e81 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt @@ -11,8 +11,8 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.5.1", "6.4.1", "6.3", "6.2.2", "6.1.1", "6.0", "5.6.4"), - kotlinVersions = listOf("1.3.30", "1.3.72", "1.4.0-rc") + gradleVersions = listOf("6.5.1", *ifExhaustive("6.4.1", "6.3", "6.2.2", "6.1.1", "6.0"), "5.6.4"), + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72"), "1.4.0-rc") ) } -- cgit