From 2e4121457a0fbae1a216007aee6c84a01be628f5 Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Tue, 7 Jun 2022 14:49:18 +0300 Subject: Bump Kotlin to 1.7.0-RC2 (#2522) --- gradle.properties | 4 ++-- .../kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt | 2 +- .../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 2 +- .../descriptors/DefaultDescriptorToDocumentableTranslator.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7834dd47..c9ee3472 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ dokka_version=1.7.0-SNAPSHOT dokka_integration_test_parallelism=2 # Versions -kotlin_version=1.7.0-RC +kotlin_version=1.7.0-RC2 coroutines_version=1.6.0 kotlinx_html_version=0.7.3 -kotlin_plugin_version=213-1.7.0-RC-release-217-IJ6777.52 +kotlin_plugin_version=213-1.7.0-RC2-release-258-IJ6777.52 jsoup_version=1.14.3 idea_version=213.6777.52 language_version=1.4 diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt index cef9fd8b..3e154197 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt @@ -18,7 +18,7 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract // some core react classes were moved from `react-router-dom` to `react` artifacts. // Writing an integration test project that would work for both 1.4.0 and 1.5.0 would involve // ugly solutions, so these versions are ignored. Not a big loss given they are deprecated as of this moment. - "1.4.0", "1.4.32", "1.7.0-RC" + "1.4.0", "1.4.32", "1.7.0-RC2" ) @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index 7f2ad851..c9d2619b 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -5,7 +5,7 @@ internal object TestedVersions { val BASE = BuildVersions.permutations( gradleVersions = listOf("7.4.2", "6.9"), - kotlinVersions = listOf("1.7.0-RC", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.0-RC2", "1.6.21", "1.5.31", "1.4.32"), ) + BuildVersions.permutations( gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0")) diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index 57c5fe18..6c4d7a0d 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -587,7 +587,7 @@ private class DokkaDescriptorVisitor( parameter(index, desc, DRIWithPlatformInfo(dri, actual)) }, sources = actual, - expectPresentInSet = if(isExpect) sourceSet else null, + expectPresentInSet = sourceSet.takeIf { isExpect }, visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(), documentation = descriptor.resolveDescriptorData().let { sourceSetDependent -> if (descriptor.isPrimary) { -- cgit