diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2021-04-29 17:05:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 17:05:03 +0200 |
| commit | 34be1adfc7a5a40cf649b0243eefae8b03af49e1 (patch) | |
| tree | 01273e9b4470c9c286ba1fffc936468efa96d947 /integration-tests | |
| parent | 105d275b8e932ace459d0eca2c8f31c443095465 (diff) | |
| download | dokka-34be1adfc7a5a40cf649b0243eefae8b03af49e1.tar.gz dokka-34be1adfc7a5a40cf649b0243eefae8b03af49e1.tar.bz2 dokka-34be1adfc7a5a40cf649b0243eefae8b03af49e1.zip | |
Update tests with kotlin 1.5-RC and gradle 7.0 (#1857)
* Update tests with kotlin 1.5-RC and gradle 7.0
* Update tests with kotlin 1.5-RC and gradle 7.0
Diffstat (limited to 'integration-tests')
4 files changed, 14 insertions, 8 deletions
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 d51f27e6..2460c291 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,11 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", *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") + gradleVersions = listOf("7.0", *ifExhaustive("6.6", "6.4.1", "6.3", "6.2.2", "6.1.1")), + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0-RC") + ) + BuildVersions.permutations( + gradleVersions = listOf("5.6.4", "6.0"), + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32")) ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt index 9746c8b8..a3b58e35 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt @@ -15,8 +15,11 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "5.6.4"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6"), + kotlinVersions = listOf("1.3.72", "1.4.0", "1.5.0-RC") + ) + BuildVersions.permutations( + gradleVersions = listOf("5.6.4"), + kotlinVersions = listOf("1.4.0", "1.4.32") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt index c3971eae..db9239e9 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt @@ -10,8 +10,8 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.1.1"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6", "6.1.1"), + kotlinVersions = listOf("1.5.0-RC", "1.4.0") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt index c3ea8e52..cde82246 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt @@ -10,8 +10,8 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.1.1"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6", "6.1.1"), + kotlinVersions = listOf("1.5.0-RC", "1.4.0") ) } |