Bump Kotlin to 1.7.0-RC2 (#2522)

Kotlin · Jun 7, 2022 · 2e41214 · 2e41214
1 parent 73f78dc
commit 2e41214
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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/...dle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/...dle/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/...n-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/...n-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/...base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/...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) {