diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2021-06-15 14:23:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 14:23:42 +0200 |
| commit | f24060408be04bce08f523579c0f6ad358a58a34 (patch) | |
| tree | 90ae069600ca059cb031ce5ce40fe00ef1023de7 /integration-tests/gradle/src/integrationTest/kotlin/org | |
| parent | 4c6ce7a2581074c9b8f3e82fb51d2d953db0d49b (diff) | |
| download | dokka-f24060408be04bce08f523579c0f6ad358a58a34.tar.gz dokka-f24060408be04bce08f523579c0f6ad358a58a34.tar.bz2 dokka-f24060408be04bce08f523579c0f6ad358a58a34.zip | |
Remove JDK 8 on windows due to OOM and bump kotlin version in test (#1971)
Diffstat (limited to 'integration-tests/gradle/src/integrationTest/kotlin/org')
4 files changed, 4 insertions, 4 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 2460c291..11f20ae8 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 @@ -12,7 +12,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac @get:Parameters(name = "{0}") val versions = BuildVersions.permutations( 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") + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.10") ) + 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 a3b58e35..78e835eb 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 @@ -16,7 +16,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("7.0", "6.6"), - kotlinVersions = listOf("1.3.72", "1.4.0", "1.5.0-RC") + kotlinVersions = listOf("1.3.72", "1.4.0", "1.5.10") ) + 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 db9239e9..12e6cfad 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 @@ -11,7 +11,7 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.5.0-RC", "1.4.0") + kotlinVersions = listOf("1.5.10", "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 cde82246..7806ad5a 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 @@ -11,7 +11,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.5.0-RC", "1.4.0") + kotlinVersions = listOf("1.5.10", "1.4.0") ) } |