diff options
6 files changed, 14 insertions, 14 deletions
diff --git a/gradle.properties b/gradle.properties index af58f179..be50ecb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ # Project Settings -dokka_version_base=1.6.0-RC2 +dokka_version_base=1.6.0 dokka_publication_channels=maven-central-snapshot&space-dokka-dev dokka_integration_test_parallelism=2 # Versions -kotlin_version=1.6.0-RC2 +kotlin_version=1.6.0 coroutines_version=1.5.1 kotlinx_html_version=0.7.3 -kotlin_plugin_version=211-1.6.0-RC2-release-766-IJ7442.40 +kotlin_plugin_version=211-1.6.0-release-795-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 fbebde7d..6aca3080 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 @@ -20,9 +20,9 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst kotlinVersions = listOf("1.4.0", *ifExhaustive("1.3.72")), androidGradlePluginVersions = listOf("4.0.0") ) + BuildVersions.permutations( - gradleVersions = listOf("7.0"), - kotlinVersions = listOf("1.6.0-RC", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")), - androidGradlePluginVersions = listOf("4.2.0") + gradleVersions = listOf("7.3"), + kotlinVersions = listOf("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 4583a111..d0ca69c1 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("7.2", *ifExhaustive("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-RC") + 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") ) + 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 dd25a08b..090aa95c 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("7.2", "7.0", "6.6", "6.1.1"), - kotlinVersions = listOf("1.6.0-RC", "1.5.31", "1.5.0", "1.4.0") + 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") ) } 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 02c87f20..bb811bae 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 @@ -13,8 +13,8 @@ class MultiModule1IntegrationTest(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("6.6", "6.6", "6.1.1"), + kotlinVersions = listOf("1.6.0", "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 0768f734..408cc3b5 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 @@ -11,8 +11,8 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("7.0", "7.2"), - kotlinVersions = listOf("1.6.0-RC", "1.5.31", "1.5.0") + gradleVersions = listOf("7.0", "7.3"), + kotlinVersions = listOf("1.6.0", "1.5.31", "1.5.0") ) } |