From f7db5033b5bdbbf6ade45b65ca1d6d03893ee8a1 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 17 Dec 2021 16:27:45 +0300 Subject: [PATCH] Update kotlin and dokka versions to 1.6.10 (#2274) --- gradle.properties | 6 +++--- .../dokka/it/gradle/Android0GradleIntegrationTest.kt | 2 +- .../jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt | 2 +- .../dokka/it/gradle/MultiModule0IntegrationTest.kt | 2 +- .../dokka/it/gradle/MultiModule1IntegrationTest.kt | 2 +- .../jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index be50ecb835..49b900b736 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ # Project Settings -dokka_version_base=1.6.0 +dokka_version_base=1.6.10 dokka_publication_channels=maven-central-snapshot&space-dokka-dev dokka_integration_test_parallelism=2 # Versions -kotlin_version=1.6.0 +kotlin_version=1.6.10 coroutines_version=1.5.1 kotlinx_html_version=0.7.3 -kotlin_plugin_version=211-1.6.0-release-795-IJ7442.40 +kotlin_plugin_version=211-1.6.10-release-923-IJ7442.40 jsoup_version=1.13.1 idea_version=211.7442.40 language_version=1.4 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 6aca30809f..4352175f6b 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 @@ -21,7 +21,7 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst androidGradlePluginVersions = listOf("4.0.0") ) + BuildVersions.permutations( gradleVersions = listOf("7.3"), - kotlinVersions = listOf("1.6.0", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")), + kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")), androidGradlePluginVersions = listOf("7.0.0") ) } 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 d0ca69c15f..cd13e47e8f 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.3", *ifExhaustive("7.2", "7.0", "6.6", "6.3", "6.2.2", "6.1.1")), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0") + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0", "1.6.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/MultiModule0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt index 090aa95cbe..35823a9191 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.3", "7.2", "7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.6.0", "1.5.31", "1.5.0", "1.4.0") + kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0", "1.4.0") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt index bb811bae13..76be6cb8d7 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt @@ -14,7 +14,7 @@ class MultiModule1IntegrationTest(override val versions: BuildVersions) : Abstra @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("6.6", "6.6", "6.1.1"), - kotlinVersions = listOf("1.6.0", "1.4.0") + kotlinVersions = listOf("1.6.10", "1.4.0") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt index 408cc3b529..56da7bc97f 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt @@ -12,7 +12,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( gradleVersions = listOf("7.0", "7.3"), - kotlinVersions = listOf("1.6.0", "1.5.31", "1.5.0") + kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0") ) }